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

fix(征求意见流程): 80302

Browse Source
This commit is contained in:
yjz
2024-01-26 09:02:51 +08:00
parent 9f521b4c13
commit 3b726c5f4c
2 changed files with 16 additions and 7 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
+13 -7
View File
@@ -297,19 +297,22 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
String replacedOld = (String) oldMap.get(FieldCommon.REPLACED_STANDARD); // 代替标准
String referenceOld = (String) oldMap.get(FieldCommon.REFERENCE_STANDARD); // 引用标准
String userId = "";
String templateCode = "";
if (StringUtils.isNotBlank(replaced) && !replaced.equals(replacedOld) && StringUtils.isNotBlank(replacedOld)) { // 代替标准
List<String> replacedOldList = Arrays.asList(replacedOld.split(","));
if (StringUtils.isNotBlank(replaced) && !replaced.equals(replacedOld)) { // 代替标准
String userId = "";
String templateCode = "";
List<String> replacedList = Arrays.asList(replaced.split(","));
LambdaQueryWrapper<ProcessFbEntryChange> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ProcessFbEntryChange::getStandardNumber, replacedOldList);
queryWrapper.in(ProcessFbEntryChange::getStandardNumber, replacedList);
queryWrapper.eq(ProcessFbEntryChange::getOperateType, "1");
List<ProcessFbEntryChange> processFbEntryChangeList = list(queryWrapper);
userId = processFbEntryChangeList.stream().map(ProcessFbEntryChange::getUserId).collect(Collectors.joining(","));
templateCode = MessageTemplateCodeCommon.STANDARD_CHANGE_REPLACE;
sendMsg(objectMap, module, standardNumber, standardName, oldMap, userId, templateCode);
}
if (StringUtils.isNotBlank(reference) && !reference.equals(referenceOld)) { // 引用标准
// if (StringUtils.isNotBlank(reference) && !reference.equals(referenceOld)) { // 引用标准
String userId = "";
String templateCode = "";
List<LawsReplacedStandard> lawsReplacedStandardList = lawsReplacedStandardService.list(
new LambdaQueryWrapper<LawsReplacedStandard>()
.eq(LawsReplacedStandard::getReplaced, standardNumber));
@@ -324,8 +327,11 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
}
}
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) {
if (StringUtils.isNotBlank(userId)) {
String content = getContent(objectMap, oldMap, module);
SendMessageDTO sendMessageDTO = new SendMessageDTO();
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+3
View File
@@ -335,6 +335,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String taskDefinitionKey = task.getTaskDefinitionKey();
String executionId = task.getExecutionId();
// 设计工程师填写征求意见
if (ConsultationTaskKey.DESIGN_ENGINEER_1.equals(taskDefinitionKey)
|| ConsultationTaskKey.DESIGN_ENGINEER_2.equals(taskDefinitionKey)){
@@ -354,6 +355,8 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
.eq(ProcessFbConsultationUserLink::getBusinessId, projectId)
.eq(ProcessFbConsultationUserLink::getModuleOwnerId, CurrentUserUtil.getId())
.set(ProcessFbConsultationUserLink::getModuleOwnerId, toUserId));
runtimeService.setVariable(executionId, "moduleOwner", toUserId);
}
// 各部所主管级领导分发/各部所主管级领导审批
if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey)