From 49e07332d6032956db07af47a42b8ec32925c4b2 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Thu, 26 Nov 2020 11:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/benyi/assessment/history.vue    | 98 ++++++++++++++++++-
 .../benyi/ByAssessmentcontentMapper.xml       |  3 +-
 2 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/assessment/history.vue b/ruoyi-ui/src/views/benyi/assessment/history.vue
index 367033a0c..2b0adbcf8 100644
--- a/ruoyi-ui/src/views/benyi/assessment/history.vue
+++ b/ruoyi-ui/src/views/benyi/assessment/history.vue
@@ -70,6 +70,24 @@
                         </p>
                       </div>
                     </li>
+                    <li
+                      v-for="itemMb in assessmentcontentList.filter(
+                        (p) => p.parentId == itemFzly.id
+                      )"
+                      :key="itemMb.id"
+                      v-show="
+                        assessmentcontentList.filter(
+                          (p) => p.parentId == itemMb.id
+                        ).length == 0
+                          ? true
+                          : false
+                      "
+                    >
+                      <p class="block-content-title">
+                        <span class="num">{{ itemMb.sort }}. </span
+                        >{{ itemMb.name }} (满足标准)
+                      </p>
+                    </li>
                   </ul>
                 </div>
               </div>
@@ -103,7 +121,7 @@
                         (p) => p.parentId == itemFzly.id
                       )"
                       :key="itemMb.id"
-                       v-show="
+                      v-show="
                         assessmentcontentList.filter(
                           (p) => p.parentId == itemMb.id
                         ).length == 0
@@ -127,6 +145,24 @@
                         </p>
                       </div>
                     </li>
+                    <li
+                      v-for="itemMb in assessmentcontentList.filter(
+                        (p) => p.parentId == itemFzly.id
+                      )"
+                      :key="itemMb.id"
+                      v-show="
+                        assessmentcontentList.filter(
+                          (p) => p.parentId == itemMb.id
+                        ).length == 0
+                          ? true
+                          : false
+                      "
+                    >
+                      <p class="block-content-title">
+                        <span class="num">{{ itemMb.sort }}. </span
+                        >{{ itemMb.name }} (满足标准)
+                      </p>
+                    </li>
                   </ul>
                 </div>
               </div>
@@ -163,7 +199,7 @@
                         (p) => p.parentId == itemFzly.id
                       )"
                       :key="itemMb.id"
-                       v-show="
+                      v-show="
                         assessmentcontentList.filter(
                           (p) => p.parentId == itemMb.id
                         ).length == 0
@@ -187,6 +223,24 @@
                         </p>
                       </div>
                     </li>
+                    <li
+                      v-for="itemMb in assessmentcontentList.filter(
+                        (p) => p.parentId == itemFzly.id
+                      )"
+                      :key="itemMb.id"
+                      v-show="
+                        assessmentcontentList.filter(
+                          (p) => p.parentId == itemMb.id
+                        ).length == 0
+                          ? true
+                          : false
+                      "
+                    >
+                      <p class="block-content-title">
+                        <span class="num">{{ itemMb.sort }}. </span
+                        >{{ itemMb.name }} (满足标准)
+                      </p>
+                    </li>
                   </ul>
                 </div>
               </div>
@@ -223,7 +277,7 @@
                         (p) => p.parentId == itemFzly.id
                       )"
                       :key="itemMb.id"
-                       v-show="
+                      v-show="
                         assessmentcontentList.filter(
                           (p) => p.parentId == itemMb.id
                         ).length == 0
@@ -247,6 +301,24 @@
                         </p>
                       </div>
                     </li>
+                    <li
+                      v-for="itemMb in assessmentcontentList.filter(
+                        (p) => p.parentId == itemFzly.id
+                      )"
+                      :key="itemMb.id"
+                      v-show="
+                        assessmentcontentList.filter(
+                          (p) => p.parentId == itemMb.id
+                        ).length == 0
+                          ? true
+                          : false
+                      "
+                    >
+                      <p class="block-content-title">
+                        <span class="num">{{ itemMb.sort }}. </span
+                        >{{ itemMb.name }} (满足标准)
+                      </p>
+                    </li>
                   </ul>
                 </div>
               </div>
@@ -283,7 +355,7 @@
                         (p) => p.parentId == itemFzly.id
                       )"
                       :key="itemMb.id"
-                       v-show="
+                      v-show="
                         assessmentcontentList.filter(
                           (p) => p.parentId == itemMb.id
                         ).length == 0
@@ -307,6 +379,24 @@
                         </p>
                       </div>
                     </li>
+                    <li
+                      v-for="itemMb in assessmentcontentList.filter(
+                        (p) => p.parentId == itemFzly.id
+                      )"
+                      :key="itemMb.id"
+                      v-show="
+                        assessmentcontentList.filter(
+                          (p) => p.parentId == itemMb.id
+                        ).length == 0
+                          ? true
+                          : false
+                      "
+                    >
+                      <p class="block-content-title">
+                        <span class="num">{{ itemMb.sort }}. </span
+                        >{{ itemMb.name }} (满足标准)
+                      </p>
+                    </li>
                   </ul>
                 </div>
               </div>
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
index 60e155233..e6331f388 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
@@ -76,13 +76,14 @@ where find_in_set(id, getChildLst(#{id})) ;
     <!--根据节点id获取领域目标-->
     <select id="selectNodeByid" parameterType="Long" resultMap="ByAssessmentcontentResult">
 		select id, parentId, name, iselement, scope, create_time, sort, ckbz  from by_assessmentcontent
-where find_in_set(id, getChildLst(#{id})) and parentId>#{id} and iselement='N';
+where find_in_set(id, getChildLst(#{id})) and parentId>#{id} and iselement='N' order by id;
 	</select>
 
     <!--根据幼儿id获取未评选的指标-->
     <select id="selectNoByAssessmentcontentListByChild" parameterType="Long" resultMap="ByAssessmentcontentResult">
 		SELECT id, parentId, name, iselement, scope, create_time, sort, ckbz, jyjy  FROM by_assessmentcontent
 where id not in(select contentid from by_assessmentchild where childid=#{childid})
+order by id;
 	</select>
 
     <insert id="insertByAssessmentcontent" parameterType="ByAssessmentcontent" useGeneratedKeys="true" keyProperty="id">