diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 68195d3b..233d6fd8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -294,11 +294,15 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl oldMap = lawsCommonService.getByIdAndModule(id, module, "2", null); String replaced = (String) objectMap.get(FieldCommon.REPLACED_STANDARD); // 代替标准 + String replacedBy = (String) objectMap.get(FieldCommon.REPLACED_BY_STANDARD); // 被代替标准 String reference = (String) objectMap.get(FieldCommon.REFERENCE_STANDARD); // 引用标准 + String referenceBy = (String) objectMap.get(FieldCommon.REFERENCED_STANDARD); // 被引用标准 String replacedOld = (String) oldMap.get(FieldCommon.REPLACED_STANDARD); // 代替标准 + String replacedByOld = (String) oldMap.get(FieldCommon.REPLACED_BY_STANDARD); // 被代替标准 String referenceOld = (String) oldMap.get(FieldCommon.REFERENCE_STANDARD); // 引用标准 - if (StringUtils.isNotBlank(replaced) && !replaced.equals(replacedOld)) { // 代替标准 + // 代替标准发消息 + if (StringUtils.isNotBlank(replaced)) { String userId = ""; String templateCode = ""; List replacedList = Arrays.asList(replaced.split(",")); @@ -310,26 +314,34 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl lawsReplacedStandardList = lawsReplacedStandardService.list( - new LambdaQueryWrapper() - .eq(LawsReplacedStandard::getReplaced, standardNumber)); - if (!lawsReplacedStandardList.isEmpty()){ - List replacedByList = lawsReplacedStandardList.stream().map(LawsReplacedStandard::getReplacedBy).collect(Collectors.toList()); - List lawsEnterpriseStandardList = lawsEnterpriseStandardService.list( - new LambdaQueryWrapper() - .in(LawsEnterpriseStandard::getStandardNumber, replacedByList)); - if (!lawsEnterpriseStandardList.isEmpty()){ - List mainDraftingUserList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getMainDraftingUser).collect(Collectors.toList()); - userId = String.join(",", mainDraftingUserList); - } - } - templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REFERENCE; + List replacedByList = Arrays.asList(replacedBy.split(",")); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ProcessFbEntryChange::getStandardNumber, replacedByList); + queryWrapper.eq(ProcessFbEntryChange::getOperateType, "1"); + List processFbEntryChangeList = list(queryWrapper); + userId = processFbEntryChangeList.stream().map(ProcessFbEntryChange::getUserId).collect(Collectors.joining(",")); + templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REPLACE_BY; sendMsg(objectMap, module, standardNumber, standardName, oldMap, userId, templateCode); -// } + } + // 引用标准 + if (StringUtils.isNotBlank(referenceBy)) { + String userId = ""; + String templateCode = ""; + List referenceByList = Arrays.asList(referenceBy.split(",")); + List lawsEnterpriseStandardList = lawsEnterpriseStandardService.list( + new LambdaQueryWrapper() + .in(LawsEnterpriseStandard::getStandardNumber, referenceByList)); + if (!lawsEnterpriseStandardList.isEmpty()){ + List mainDraftingUserList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getMainDraftingUser).collect(Collectors.toList()); + userId = String.join(",", mainDraftingUserList); + templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REFERENCE; + sendMsg(objectMap, module, standardNumber, standardName, oldMap, userId, templateCode); + } + } } private void sendMsg(Map objectMap, String module, String standardNumber, String standardName, Map oldMap, String userId, String templateCode) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java index 11cd454d..2dfcba15 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java @@ -17,7 +17,8 @@ public class MessageTemplateCodeCommon { public static final String ES_INSPECT_PLAN = "es_inspect_plan"; // 【企标稽查计划】流程结束 public static final String STANDARD_DECLARE = "standard_declare"; // 【标准宣贯】流程结束 public static final String DATA_CENTER = "data_center"; // 【资料中心】推送范围 - public static final String STANDARD_CHANGE_REPLACE = "standard_change_replace"; // 【法规变更】代替/被代替标准变更 + public static final String STANDARD_CHANGE_REPLACE = "standard_change_replace"; // 【法规变更】代替 + public static final String STANDARD_CHANGE_REPLACE_BY = "standard_change_replace_by"; // 【法规变更】被代替标准变更 public static final String STANDARD_CHANGE_REFERENCE = "standard_change_reference"; // 【法规变更】引用标准变更 public static final String STANDARD_CONSULTATION = "standard_consultation"; // 【征求意见结果提醒】 public static final String PROJECT_ASSESS_COMPLETE = "project_assess_complete"; // 【项目合规评估完成提醒】