diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java index f35ac45..535c051 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java @@ -188,14 +188,15 @@ public class SafetyEnvironmentalInspectionAddExe { queryWrapper.eq("delete_enum", "FALSE"); KeyProjectDO keyProjectDO = keyProjectRepository.getOne(queryWrapper); List messageUserList = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(cmd.getInspectionId(), 2); - for (SafetyEnvironmentalInspectionUserDO insUser : messageUserList){ - Map sendParams = new HashMap<>(); - sendParams.put("initiatorName", ssoUser.getName()); - sendParams.put("checkTitle", keyProjectDO.getProjectName()); - messageNoticeExe.messageNotice(insUser.getUserId(), messageTemplateConfig.getCheckerApplyCheck(), sendParams); - //待办 - messageNoticeExe.sendMessageAddEvent(insUser.getUserId(), "您有一条【安全环保检查】待处理","待核实", safetyEnvironmentalInspectionCO.getId(), insUser.getId()); - } + // todo 可能会导致异步任务被线程池拒绝 +// for (SafetyEnvironmentalInspectionUserDO insUser : messageUserList){ +// Map sendParams = new HashMap<>(); +// sendParams.put("initiatorName", ssoUser.getName()); +// sendParams.put("checkTitle", keyProjectDO.getProjectName()); +// messageNoticeExe.messageNotice(insUser.getUserId(), messageTemplateConfig.getCheckerApplyCheck(), sendParams); +// //待办 +// messageNoticeExe.sendMessageAddEvent(insUser.getUserId(), "您有一条【安全环保检查】待处理","待核实", safetyEnvironmentalInspectionCO.getId(), insUser.getId()); +// } } return safetyEnvironmentalInspectionCO; } diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml index 869bf12..5e69236 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml @@ -11,7 +11,7 @@ au.name as accept_user_name, GROUP_CONCAT(DISTINCT hfu.name) find_user_name, GROUP_CONCAT(DISTINCT hfd.name) find_department_name, - IFNULL(kp.project_name, kp2.project_name) AS project_name, + IFNULL(kp.project_name, kp2.project_name) AS project_name, MAX(hrr.rectification_time) as rectification_time, MAX(har.accept_time) as accept_time from