修改消防告警信息相关bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java

@@ -622,6 +622,7 @@ public class EmergencyController extends AbstractBaseController {
 								   @RequestParam(required = false) List<String> emergencyLevels,
 								   @RequestParam(required = false) String name,
 								   @RequestParam(required = false) Integer cleanStatus,
+								   @RequestParam(required = false) Integer handleStatus,
 								   @RequestParam(required = false) String bizOrgCode) {
 		Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
 		if (StringUtils.isEmpty(bizOrgCode)) {
@@ -634,7 +635,7 @@ public class EmergencyController extends AbstractBaseController {
 				}
 			}
 		}
-		return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, types, emergencyLevels, name, cleanStatus));
+		return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, types, emergencyLevels, name, cleanStatus, handleStatus));
 	}
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java

@@ -92,6 +92,6 @@ public interface EmergencyMapper extends BaseMapper{
      * @param name 设备名称
      * @return
      */
-    Page<Map<String, Object>> alarmList(@Param("page") Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode, @Param("types") List<String> types, @Param("emergencyLevels") List<String> emergencyLevels, @Param("name") String name, @Param("cleanStatus") Integer cleanStatus);
+    Page<Map<String, Object>> alarmList(@Param("page") Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode, @Param("types") List<String> types, @Param("emergencyLevels") List<String> emergencyLevels, @Param("name") String name, @Param("cleanStatus") Integer cleanStatus, @Param("handleStatus") Integer handleStatus);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java

@@ -58,5 +58,5 @@ public interface IEmergencyService {
 
     List<Map<String, Object>> getPressurePumpDiagnosticAnalysis(String equipmentCode, String nameKeys, String fieldKey, String bizOrgCode, String appKey, String product, String token);
 
-    Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus);
+    Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

@@ -453,7 +453,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
     }
 
     @Override
-    public Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus) {
-        return emergencyMapper.alarmList(page, bizOrgCode, types, emergencyLevels, name, cleanStatus);
+    public Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus) {
+        return emergencyMapper.alarmList(page, bizOrgCode, types, emergencyLevels, name, cleanStatus, handleStatus);
     }
 }

amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml

@@ -1157,8 +1157,8 @@
 
         IF (
         wlesal.confirm_type IS NULL,
-        '未处理',
-        '已处理'
+        '未确认',
+        '已确认'
         ) handleStatus,
 
         IF (
@@ -1214,6 +1214,14 @@
                 and wlesal.clean_time IS NOT NULL
             </if>
 
+            <if test="handleStatus != null and handleStatus != '' and handleStatus == 2">
+                and wlesal.confirm_type IS NULL
+            </if>
+
+            <if test="handleStatus != null and handleStatus != '' and handleStatus == 1">
+                and wlesal.confirm_type IS NOT NULL
+            </if>
+
             <if test="types != null">
                 <foreach collection="types" index="index" item="item" open="and (" separator=" OR " close=")">
                     wlesal.type = #{item}