巡查自检-巡检计划-新增/修改弹窗的地点数据查询 调整

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/AlarmFireMapper.java

@@ -22,5 +22,6 @@ public interface AlarmFireMapper extends CrudMapper<AlarmFire> {
     List<AlarmFireStatisticalVo> selectAlarmFireStatistical(@Param("deviceList") List<String> deviceList,
                                                             @Param("alarmTypeList") List<Integer> alarmTypeList,
                                                             @Param("startDate") String startDate,
-                                                            @Param("endDate") String endDate);
+                                                            @Param("endDate") String endDate,
+                                                            @Param("selectStatus") Integer selectStatus);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/AlarmFireServiceImpl.java

@@ -140,7 +140,16 @@ public class AlarmFireServiceImpl extends AbstractCrudService<AlarmFireMapper, A
         }
         //缺少维保单位部分代码
         List<String> devcieCodeList = new ArrayList<>();
-        List<AlarmFireStatisticalVo> list = baseMapper.selectAlarmFireStatistical(devcieCodeList, alarmTypeList, startDate, endDate);
+        List<Integer> alarmTypeListOne = new ArrayList<>();
+        Integer selectStatus = 0;
+        if (alarmTypeList.contains(100)){
+            selectStatus = 1;
+            alarmTypeListOne.add(2);
+            alarmTypeListOne.add(4);
+        }else {
+            alarmTypeListOne = alarmTypeList;
+        }
+        List<AlarmFireStatisticalVo> list = baseMapper.selectAlarmFireStatistical(devcieCodeList, alarmTypeListOne, startDate, endDate,selectStatus);
         List<Integer> alarmCountList = new ArrayList<>();
         List<Integer> handleCountList = new ArrayList<>();
         List<String> alarmTimeList = new ArrayList<>();

service-fire/service-fire-biz/src/main/resources/mapper/fire/AlarmFireMapper.xml

@@ -44,12 +44,23 @@
             <if test="startDate != null and startDate != '' and startDate != null and startDate != ''">
                 and  alarm_time BETWEEN  #{startDate} AND  #{endDate}
             </if>
-            <if test="alarmTypeList != null and alarmTypeList.size() > 0">
-                AND alarm_type in
-                <foreach item="item" collection="alarmTypeList" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+            <if test="selectStatus == 0">
+                <if test="alarmTypeList != null and alarmTypeList.size() > 0">
+                    AND alarm_type in
+                    <foreach item="item" collection="alarmTypeList" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </if>
+            <if test="selectStatus == 1">
+                <if test="alarmTypeList != null and alarmTypeList.size() > 0">
+                    AND alarm_type not in
+                    <foreach item="item" collection="alarmTypeList" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
             </if>
+
         </where>
         GROUP BY
         alarmTime