From 35c4fab6ac41f3fe4e30d1128deca48bfc056ed7 Mon Sep 17 00:00:00 2001 From: tianxinlei Date: Fri, 15 May 2026 15:43:00 +0800 Subject: [PATCH] =?UTF-8?q?5-15=20-=20SafetyEnvironmentalInspectionAddExe?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=BE=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafetyEnvironmentalInspectionAddExe.java | 17 +++++++++-------- .../src/main/resources/mapper/HiddenMapper.xml | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) 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