zcloud_gbs
/
zcloud_gbs_key_project
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5-15 - SafetyEnvironmentalInspectionAddExe文件暂时去掉推送待办

main
tianxinlei 2026-05-15 15:43:00 +08:00
parent b61acd96e1
commit 35c4fab6ac
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java
View File

@ -188,14 +188,15 @@ public class SafetyEnvironmentalInspectionAddExe {
queryWrapper.eq("delete_enum", "FALSE"); queryWrapper.eq("delete_enum", "FALSE");
KeyProjectDO keyProjectDO = keyProjectRepository.getOne(queryWrapper); KeyProjectDO keyProjectDO = keyProjectRepository.getOne(queryWrapper);
List<SafetyEnvironmentalInspectionUserDO> messageUserList = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(cmd.getInspectionId(), 2); List<SafetyEnvironmentalInspectionUserDO> messageUserList = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(cmd.getInspectionId(), 2);
for (SafetyEnvironmentalInspectionUserDO insUser : messageUserList){ // todo 可能会导致异步任务被线程池拒绝
Map<String, Object> sendParams = new HashMap<>(); // for (SafetyEnvironmentalInspectionUserDO insUser : messageUserList){
sendParams.put("initiatorName", ssoUser.getName()); // Map<String, Object> sendParams = new HashMap<>();
sendParams.put("checkTitle", keyProjectDO.getProjectName()); // sendParams.put("initiatorName", ssoUser.getName());
messageNoticeExe.messageNotice(insUser.getUserId(), messageTemplateConfig.getCheckerApplyCheck(), sendParams); // sendParams.put("checkTitle", keyProjectDO.getProjectName());
//待办 // messageNoticeExe.messageNotice(insUser.getUserId(), messageTemplateConfig.getCheckerApplyCheck(), sendParams);
messageNoticeExe.sendMessageAddEvent(insUser.getUserId(), "您有一条【安全环保检查】待处理","待核实", safetyEnvironmentalInspectionCO.getId(), insUser.getId()); // //待办
} // messageNoticeExe.sendMessageAddEvent(insUser.getUserId(), "您有一条【安全环保检查】待处理","待核实", safetyEnvironmentalInspectionCO.getId(), insUser.getId());
// }
} }
return safetyEnvironmentalInspectionCO; return safetyEnvironmentalInspectionCO;
} }

2
web-infrastructure/src/main/resources/mapper/HiddenMapper.xml
View File

@ -11,7 +11,7 @@
au.name as accept_user_name, au.name as accept_user_name,
GROUP_CONCAT(DISTINCT hfu.name) find_user_name, GROUP_CONCAT(DISTINCT hfu.name) find_user_name,
GROUP_CONCAT(DISTINCT hfd.name) find_department_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(hrr.rectification_time) as rectification_time,
MAX(har.accept_time) as accept_time MAX(har.accept_time) as accept_time
from from