ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准法规变更流程): 80749

Browse Source
This commit is contained in:
yjz
2024-02-04 10:55:12 +08:00
parent 70222fc1e5
commit d489ac6cf0
2 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+30 -18
View File
@@ -294,11 +294,15 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
Map<String, Object> 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<String> replacedList = Arrays.asList(replaced.split(","));
@@ -310,26 +314,34 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REPLACE;
sendMsg(objectMap, module, standardNumber, standardName, oldMap, userId, templateCode);
}
// if (StringUtils.isNotBlank(reference) && !reference.equals(referenceOld)) { // 引用标准
// 被代替标准发消息
if (StringUtils.isNotBlank(replacedBy)) {
String userId = "";
String templateCode = "";
List<LawsReplacedStandard> lawsReplacedStandardList = lawsReplacedStandardService.list(
new LambdaQueryWrapper<LawsReplacedStandard>()
.eq(LawsReplacedStandard::getReplaced, standardNumber));
if (!lawsReplacedStandardList.isEmpty()){
List<String> replacedByList = lawsReplacedStandardList.stream().map(LawsReplacedStandard::getReplacedBy).collect(Collectors.toList());
List<LawsEnterpriseStandard> lawsEnterpriseStandardList = lawsEnterpriseStandardService.list(
new LambdaQueryWrapper<LawsEnterpriseStandard>()
.in(LawsEnterpriseStandard::getStandardNumber, replacedByList));
if (!lawsEnterpriseStandardList.isEmpty()){
List<String> mainDraftingUserList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getMainDraftingUser).collect(Collectors.toList());
userId = String.join(",", mainDraftingUserList);
}
}
templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REFERENCE;
List<String> replacedByList = Arrays.asList(replacedBy.split(","));
LambdaQueryWrapper<ProcessFbEntryChange> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ProcessFbEntryChange::getStandardNumber, replacedByList);
queryWrapper.eq(ProcessFbEntryChange::getOperateType, "1");
List<ProcessFbEntryChange> 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<String> referenceByList = Arrays.asList(referenceBy.split(","));
List<LawsEnterpriseStandard> lawsEnterpriseStandardList = lawsEnterpriseStandardService.list(
new LambdaQueryWrapper<LawsEnterpriseStandard>()
.in(LawsEnterpriseStandard::getStandardNumber, referenceByList));
if (!lawsEnterpriseStandardList.isEmpty()){
List<String> 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<String, Object> objectMap, String module, String standardNumber, String standardName, Map<String, Object> oldMap, String userId, String templateCode) {
laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java
+2 -1
View File
@@ -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"; // 【项目合规评估完成提醒】