隐患app列表bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -615,12 +615,11 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
             for (LatentDangerBo bo : dangerList) {
                 List<JSONObject> filterTaskList =
                         taskList.stream().filter(t -> t.getString("businessKey").equals(bo.getBusinessKey())).collect(Collectors.toList());
-                if (ValidationUtil.isEmpty(filterTaskList)) {
-                    continue;
-                }
-                JSONObject task = filterTaskList.get(0);
                 LatentDangerListVo vo = new LatentDangerListVo();
+                if (!ValidationUtil.isEmpty(filterTaskList)) {
+                    JSONObject task = filterTaskList.get(0);
                     vo.setTaskId(task.getString("id"));
+                }
                 vo.setDangerId(bo.getId());
                 vo.setOvertimeState(bo.getOvertimeState());
                 vo.setDangerName(bo.getDangerName());

amos-boot-system-patrol/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -873,10 +873,18 @@
             p_latent_danger pld
         WHERE 1=1
         <if test="businessKeys != null and businessKeys.size > 0">
-            and pld.business_key IN
-            <foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
+            and (
+            pld.business_key IN
+            <foreach collection="businessKeys" item="businessKey" index="index" open="(" close=")" separator=",">
                 #{businessKey}
             </foreach>
+            <if
+                    test="latentDangerListParam.dangerState != null and latentDangerListParam.dangerState == 5 or latentDangerListParam.dangerState == 6">
+                or pld.danger_state=#{latentDangerListParam.dangerState}
+            </if>
+            <if test="latentDangerListParam.dangerState == null">
+                or pld.danger_state = 5 or pld.danger_state = 6
+            </if>)
         </if>
         <if test="latentDangerListParam.dangerLevel != null and latentDangerListParam.dangerLevel != -1">
             and pld.danger_level=#{latentDangerListParam.dangerLevel}
@@ -906,10 +914,19 @@
         p_latent_danger pld
         WHERE 1=1
         <if test="businessKeys != null and businessKeys.size > 0">
-            and pld.business_key IN
-            <foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
+            and (
+                pld.business_key IN
+            <foreach collection="businessKeys" item="businessKey" index="index" open="(" close=")" separator=",">
                 #{businessKey}
             </foreach>
+            <if
+                    test="latentDangerListParam.dangerState != null and latentDangerListParam.dangerState == 5 or latentDangerListParam.dangerState == 6">
+                or pld.danger_state=#{latentDangerListParam.dangerState}
+            </if>
+            <if test="latentDangerListParam.dangerState == null">
+                or pld.danger_state = 5 or pld.danger_state = 7
+            </if>
+                )
         </if>
         <if test="latentDangerListParam.dangerLevel != null and latentDangerListParam.dangerLevel != -1">
             and pld.danger_level=#{latentDangerListParam.dangerLevel}