Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp

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

@@ -2184,6 +2184,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
     @Override
     public List<Map<String, Object>> getSystemAlarmInfoList(String startDate, String endDate) {
+        if (!StringUtil.isNotEmpty(startDate)) {
+            startDate = null;
+        }
+        if (!StringUtil.isNotEmpty(endDate)) {
+            endDate = null;
+        }
         return fireFightingSystemMapper.getSystemAlarmInfoList(startDate, endDate);
     }
 

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

@@ -206,7 +206,6 @@
                     wl_equipment_specific wes
                 WHERE
                     wes.equipment_code LIKE concat( '920319', '%' )
-                  AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
             ) temp
     </select>
 

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

@@ -2847,6 +2847,7 @@
         LEFT JOIN wl_equipment_specific_alarm esa ON esa.equipment_specific_id = es.id
         WHERE
         ed.`code` LIKE '92010800%'
+        AND es.iot_code IS NOT NULL
         AND es.biz_org_code like concat(#{bizOrgCode}, '%')
         <if test="systemCode!=null and systemCode!=''">
             AND fs.code = #{systemCode,jdbcType=VARCHAR}
@@ -2884,7 +2885,7 @@
         LEFT JOIN wl_warehouse_structure wws ON wsd.warehouse_structure_id = wws.id
         LEFT JOIN  wl_equipment_category wec on wec.id=eq.category_id
         <where>
-            and wec.industry_code = 2
+            wec.industry_code = 2
         <if test="dto.code!=null and dto.code!=''">
             and wesp.code = #{dto.code}
         </if>
@@ -4063,7 +4064,14 @@
 
             ) temp
             LEFT JOIN
+
+
+
+
             (
+
+
+
         SELECT temp.*,
         CASE
         WHEN wei.is_trend = 0 then "遥信"
@@ -4121,7 +4129,7 @@
     </select>
     <select id="selectAlarms" resultType="java.lang.Integer">
         SELECT
-        COUNT(1)
+            SUM(index_true_num)
         FROM
         wl_equipment_alarm_report_day report
         LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET( s.id, report.system_ids )
@@ -4454,7 +4462,8 @@
         LEFT JOIN wl_equipment equipment ON equipment.id =detail.equipment_id
         left join f_fire_fighting_system s on FIND_IN_SET(s.id,spec.system_id)
         where
-        FIND_IN_SET(#{systemId},spec.system_id) AND equipment.is_iot = 1
+        FIND_IN_SET(#{systemId},spec.system_id)
+         AND equipment.is_iot = 1
         GROUP BY code,s.id, name ORDER BY system_id, code ) a) as  a1
         GROUP BY a1.system_id
         ) as b
@@ -5298,7 +5307,7 @@
         FROM
         `f_fire_fighting_system` `fs`
         where
-            fs.system_type_code IS NOT NULL
+            fs.system_type_code IS NOT NULL AND LENGTH(trim(fs.system_type_code)) != 0 AND fs.system_type_code != 'otherSys'
     </select>
 
     <select id="getSystemCountInfo" resultType="java.util.Map">