中心BUG修改

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/SignMapper.xml

@@ -138,7 +138,7 @@
            AND is_delete = 0 AND now()  > rec_date
     </select>
 
-    <select id="querySignInfo" resultType="java.lang.Integer">
+    <select id="querySignInfo" resultType="java.util.Map">
         SELECT
             count(DISTINCT user_id) num, biz_org_name bizOrgName, biz_org_code bizOrgCode
         FROM

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

@@ -2017,6 +2017,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Scheduled(cron = "${equip.patrol.cron:0 0 23 * * ?}")
     @Transactional(rollbackFor = Exception.class)
     public void patrolTaskStatic() throws Exception {
+        log.info("开始每天巡检定时任务===========");
         List<Map<String, Object>> mapPatrol = equipmentSpecificIndexMapper.patrolTaskStatic();
         List<Map<String, Object>> mapList = new ArrayList<>();
         for (Map<String, Object> m : mapPatrol

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/CheckMapper.java

@@ -401,7 +401,7 @@ public interface CheckMapper extends BaseMapper {
 			"        date_format(\n" +
 			"        `a`.`check_time`,\n" +
 			"        '%Y-%m-%d %H:%i:%s'\n" +
-			"        ) AS `checkDate`,\n" +
+			"        ) AS `checkTime`,\n" +
 			"        (\n" +
 			"        CASE\n" +
 			"        WHEN `a`.`is_ok` = 1\n" +

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
+        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
         GROUP BY biz_org_code
     </select>
     <select id="getEquipIndexInIndex" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">