5-16 - fix

web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java

@@ -133,7 +133,12 @@ public class HiddenAcceptRecordUpdateExe {
         }
         // 驳回给整改人发代办
         if(cmd.getState() == 0){
+
+            // 这块 hiddenDO.source = 1时，SafetyEnvironmentalInspectionDO查不到数据，需要关联ai_alarm表
             SafetyEnvironmentalInspectionDO inspectionDO = safetyEnvironmentalInspectionRepository.getByInspectionId(hiddenDO.getForeignKey());
+            // todo 报错 java.lang.NullPointerException: null
+            //	HiddenAcceptRecordUpdateExe.acceptExecute(HiddenAcceptRecordUpdateExe.java:138)
+            if (inspectionDO != null) {
                 Map<String, Object> sendParamsPigeonhole = new HashMap<>();
                 sendParamsPigeonhole.put("checkTitle", inspectionDO.getProjectName());
                 messageNoticeExe.messageNotice(hiddenDO.getRectificationUserId(), messageTemplateConfig.getCheckInitiatorApplyAcceptanceNotPass(), sendParamsPigeonhole);
@@ -142,7 +147,7 @@ public class HiddenAcceptRecordUpdateExe {
                 if (userList != null && userList.size() > 0){
                     messageNoticeExe.sendMessageAddEvent(userList.get(0).getUserId(), "您有一条安全检查任务的隐患验收未通过，请及时处理。","验收被驳回", hiddenDO.getId(), hiddenDO.getId());
                 }
-
+            }
         }
 
 

web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java

@@ -236,10 +236,13 @@ public class KeyProjectQueryExe {
         queryWrapper.eq("delete_enum", "FALSE");
         queryWrapper.in("state",1,4);
         Long yhdzgCount = hiddenRepository.count(queryWrapper);
+
+        // 隐患待验收
         queryWrapper.clear();
         queryWrapper.eq("accept_user_id", id);
         queryWrapper.eq("delete_enum", "FALSE");
         queryWrapper.in("state",2);
+        queryWrapper.apply("(source NOT IN (2, 3) OR EXISTS (SELECT 1 FROM safety_environmental_inspection sei WHERE sei.inspection_id = hidden.foreign_key AND sei.status = 3))");
         Long yhdysCount = hiddenRepository.count(queryWrapper);
 
 

web-infrastructure/src/main/resources/mapper/HiddenMapper.xml

@@ -21,7 +21,6 @@
         left join user hfu on hfu.id = hf.find_user_id
         left join department hfd on hfd.id = hfu.department_id
         left join user au on au.id = h.accept_user_id
-
         left join safety_environmental_inspection i on i.inspection_id = h.foreign_key and i.status = 3 and h.source in (2, 3)
         left join key_project kp on kp.key_project_id = i.key_project_id
         left join ai_alarm aa on h.foreign_key = aa.ai_alarm_id and h.source = 1

web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml

@@ -248,7 +248,7 @@
                 left join hidden h on sei.inspection_id = h.foreign_key AND h.delete_enum = 'FALSE'
         where kp.delete_enum = 'FALSE'
           and kp.apply_status != 0
-          and jurisdiction_corpinfo_id = #{params.jurisdictionCorpinfoId}
+          and kp.jurisdiction_corpinfo_id = #{params.jurisdictionCorpinfoId}
             <if test="params.projectName != null and params.projectName != ''">
                 AND kp.project_name like concat('%',#{params.projectName},'%')
             </if>