Merge remote-tracking branch 'origin/develop_dl_bugfix_0723' into develop_dl_bugfix_0723

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

@@ -2023,26 +2023,33 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         List<Map<String, Object>> mapList = new ArrayList<>();
         for (Map<String, Object> m : mapPatrol
              ) {
-            // 判断是否一次巡查都没有
-            if(m.get("isFinishOnce").toString().equals("0")) {
-                if(m.get("planNum").toString().equals("1")) {
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("planName", m.getOrDefault("planName", ""));
-                    map.put("bizOrgCode", m.get("bizOrgCode"));
-                    map.put("bizOrgName", m.get("bizOrgName"));
-                    mapList.add(map);
-                } else if(Integer.parseInt(m.get("planNum").toString()) > 1){
-                    List<Map<String, Object>> mapPatrolTask = equipmentSpecificIndexMapper.patrolTaskQuery(m.get("bizOrgCode").toString());
-                    for (Map<String, Object> m1:mapPatrolTask
-                         ) {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("planName", m1.get("planName").toString());
-                        map.put("bizOrgCode", m1.get("bizOrgCode").toString());
-                        map.put("bizOrgName", m1.get("bizOrgName").toString());
-                        mapList.add(map);
-                    }
-                }
+            if(m.get("isFinishOnce").toString().equals("1")) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("planName", m.getOrDefault("planName", ""));
+                map.put("bizOrgCode", m.get("bizOrgCode"));
+                map.put("bizOrgName", m.get("bizOrgName"));
+                mapList.add(map);
             }
+            // 判断是否一次巡查都没有
+//            if(m.get("isFinishOnce").toString().equals("0")) {
+//                if(m.get("planNum").toString().equals("1")) {
+//                    Map<String, Object> map = new HashMap<>();
+//                    map.put("planName", m.getOrDefault("planName", ""));
+//                    map.put("bizOrgCode", m.get("bizOrgCode"));
+//                    map.put("bizOrgName", m.get("bizOrgName"));
+//                    mapList.add(map);
+//                } else if(Integer.parseInt(m.get("planNum").toString()) > 1){
+//                    List<Map<String, Object>> mapPatrolTask = equipmentSpecificIndexMapper.patrolTaskQuery(m.get("bizOrgCode").toString());
+//                    for (Map<String, Object> m1:mapPatrolTask
+//                         ) {
+//                        Map<String, Object> map = new HashMap<>();
+//                        map.put("planName", m1.get("planName").toString());
+//                        map.put("bizOrgCode", m1.get("bizOrgCode").toString());
+//                        map.put("bizOrgName", m1.get("bizOrgName").toString());
+//                        mapList.add(map);
+//                    }
+//                }
+//            }
         }
         if(mapList.size() > 0) {
             try {
@@ -2051,7 +2058,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
             }
         }
-        if(mapPatrol.size() == 0) {
+        if(mapList.size() == 0) {
             Map<String, Object> map = new HashMap<>();
             map.put("bizOrgCode", "");
             mapList.add(map);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/SignServiceImpl.java

@@ -192,10 +192,9 @@ public class SignServiceImpl extends BaseService<SignDto, Sign, SignMapper> impl
         log.info("开始出勤统计=========");
         List<Map<String, Object>> mapSign = this.baseMapper.querySignInfo();
         List<Map<String, Object>> mapList = new ArrayList<>();
-        for (Map<String, Object> m : mapSign
-        ) {
+        for (Map<String, Object> m : mapSign) {
             // 判断至少8人出勤
-            if (Integer.parseInt(m.get("num").toString()) < 8) {
+            if (Integer.parseInt(m.get("num").toString()) >= 8) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("bizOrgCode", m.get("bizOrgCode"));
                 map.put("bizOrgName", m.get("bizOrgName"));
@@ -209,7 +208,7 @@ public class SignServiceImpl extends BaseService<SignDto, Sign, SignMapper> impl
                 log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));
             }
         }
-        if (mapSign.size() == 0) {
+        if (mapList.size() == 0) {
             Map<String, Object> map = new HashMap<>();
             map.put("bizOrgCode", "");
             mapList.add(map);

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

@@ -515,7 +515,7 @@
         FROM
             `p_plan_task` ppt
                 LEFT JOIN `p_plan` pp ON pp.id = ppt.plan_id
-        where ppt.check_date  =  DATE_FORMAT( now(), '%Y-%m-%d' )  and pp.biz_org_code is not null and ppt.plan_name is not null
+        where ppt.check_date  =  DATE_FORMAT( now(), '%Y-%m-%d' )  and pp.biz_org_code is not null and ppt.plan_id is not null
         GROUP BY biz_org_code
     </select>
     <select id="getEquipIndexInIndex" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">

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

@@ -6898,7 +6898,7 @@
         SELECT
         `fs`.`id` AS `id`,
         `fs`.`name` AS `name`,
-        ( SELECT count( 1 ) FROM `wl_equipment_specific_alarm_log` WHERE 0 <![CDATA[<>]]> find_in_set( `fs`.`id`, `wl_equipment_specific_alarm_log`.`system_ids` ) ) AS `value`
+        ( SELECT count( 1 ) FROM `wl_equipment_specific_alarm` WHERE 0 <![CDATA[<>]]> find_in_set( `fs`.`id`, `wl_equipment_specific_alarm`.`system_ids` ) AND `wl_equipment_specific_alarm`.`status` = 1 ) AS `value`
         FROM
         `f_fire_fighting_system` `fs`
         WHERE