diff --git a/start/src/main/resources/sdk-prod.yml b/start/src/main/resources/sdk-prod.yml index 19ae7c8..b3e3d67 100644 --- a/start/src/main/resources/sdk-prod.yml +++ b/start/src/main/resources/sdk-prod.yml @@ -75,3 +75,5 @@ message: hiddenDangerAcceptancePersonApplyAcceptance: MS000141 checkInitiatorApplyAcceptancePass: MS000142 checkInitiatorApplyAcceptanceNotPass: MS000143 + hiddenDangerRectifyPersonApplyRectifyPass: MS000144 + diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index 7601d66..42686c4 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -56,4 +56,22 @@ archives: corePoolSize: 1 queueCapacity: 60 namePrefix: async-task- - keepAliveSeconds: 60 \ No newline at end of file + keepAliveSeconds: 60 +message: + template: + relatedPartyUnitLeaderApplyStartWork: MS000109 + xqUnitLeaderConfirmStartWork: MS000110 + relatedPartyUnitLeaderApplyFinishWork: MS000111 + xqUnitLeaderConfirmFinishWork: MS000112 + relatedPartyUnitLeaderApplyStartWorkPass: MS000132 + relatedPartyUnitLeaderApplyFinishWorkPass: MS000133 + checkInitiatorApplyCheckNotPass: MS000134 + checkedPersonApplyDefend: MS000135 + checkerApplyCheck: MS000136 + checkedPersonApplyCheckConfirm: MS000137 + checkedPersonApplyDefendPass: MS000138 + checkedPersonApplyDefendNotPass: MS000139 + hiddenDangerRectifyPersonApplyRectify: MS000140 + hiddenDangerAcceptancePersonApplyAcceptance: MS000141 + checkInitiatorApplyAcceptancePass: MS000142 + checkInitiatorApplyAcceptanceNotPass: MS000143 diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java index 668c258..79eccb5 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java @@ -147,7 +147,7 @@ public class HiddenAcceptRecordUpdateExe { messageNoticeExe.messageNotice(hiddenDO.getRectificationUserId(), messageTemplateConfig.getCheckInitiatorApplyAcceptanceNotPass(), sendParamsPigeonhole); if (aiAlarmDO.getDisposeUserId() != null) { - messageNoticeExe.sendMessageAddEvent(aiAlarmDO.getDisposeUserId(), "您有一条视频识别的隐患验收未通过,请及时处理。","验收被驳回", hiddenDO.getId(), hiddenDO.getId()); + messageNoticeExe.sendMessageAddEvent(hiddenDO.getRectificationUserId(), "您有一条隐患验收未通过,请及时处理。","验收被驳回", hiddenDO.getId(), hiddenDO.getId()); } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java index 41462c4..6418bc8 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionDefendAddExe.java @@ -118,7 +118,7 @@ public class SafetyEnvironmentalInspectionDefendAddExe { sendParamsHidden.put("checkTitle", inspectionDO.getProjectName()); sendParamsHidden.put("hiddenNumber", inspectionDO.getHiddenNumber()); messageNoticeExe.messageNotice(inspectionDO.getXgfMasterUserId(), messageTemplateConfig.getHiddenDangerRectifyPersonApplyRectify(), sendParamsHidden); - messageNoticeExe.sendMessageAddEvent(inspectionDO.getXgfMasterUserId(), "您有一条安全检查任务的待整改隐患,请及时整改。","待整改", inspectionDO.getId(), hiddenRectificationUser.getId()); + messageNoticeExe.sendMessageAddEvent(inspectionDO.getXgfMasterUserId(), "您负责整改的【"+inspectionDO.getProjectName()+"】检查任务有【"+inspectionDO.getHiddenNumber()+"】条待整改隐患,请及时处理。","待整改", inspectionDO.getId(), hiddenRectificationUser.getId()); } else { // 没有隐患,将安全环保检查状态改为已归档