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

feat: 企标制修订流程-人员回显

Browse Source
This commit is contained in:
mzaxd
2023-12-22 16:05:18 +08:00
parent f8a14a1a82
commit 59710f38de
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+21 -5
View File
@@ -124,6 +124,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
Map<String, Object> flowUser = revisionData.getFlowUser();
ProcessEsRevision data = revisionData.getData();
actVariables.put("mainDraftUser", flowUser.get("mainDraftUser"));
actVariables.put("standardizationUser", flowUser.get("standardizationUser"));
List<OtherDraftUserVO> otherDraftUserVOS = data.getOtherDraftUserVOS();
if (otherDraftUserVOS == null || otherDraftUserVOS.isEmpty()) {
actVariables.put("distribute", false);
@@ -276,10 +277,12 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
Map<String, Object> userMap = new HashMap<>();
List<EsRevisionAdvice> advices;
ProcessEsRevision data;
Map<String, Object> flowUser;
switch (xmlNodeId) {
case MAIN_DRAFT_USER_DISTRIBUTE:
// 判断是否分发 设置流程变量
data = revisionData.getData();
flowUser = revisionData.getFlowUser();
List<OtherDraftUserVO> otherDraftUserVOS = data.getOtherDraftUserVOS();
if (otherDraftUserVOS == null || otherDraftUserVOS.isEmpty()) {
taskService.setVariable(taskId, "distribute", false);
@@ -296,6 +299,11 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
data.setOtherDrafterUploadFileJson(otherDraftUserVOS);
saveOrUpdate(data);
}
String standardizationUser = (String) flowUser.get("standardizationUser");
taskService.setVariable(taskId, "standardizationUser", standardizationUser);
// 保存人员信息
Map<String, Object> actVariables = this.setVariables(revisionData);
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(actVariables));
break;
case OTHER_DRAFT_USER_UPLOAD:
data = revisionData.getData();
@@ -328,6 +336,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
taskService.setVariable(taskId, "raterList", raterList);
// 保存流程数据
saveOrUpdate(data);
userMap.put("raterList", data.getRaters());
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
}
break;
case RATER_RATE:
@@ -349,11 +359,13 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
taskService.setVariable(taskId, "contactUserList", contactUserList);
// 保存流程数据
saveOrUpdate(data);
userMap.put("contactUserList", data.getContactUser());
processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
}
break;
case CONTACT_USER_DISTRIBUTE:
data = revisionData.getData();
Map<String, Object> flowUser = revisionData.getFlowUser();
flowUser = revisionData.getFlowUser();
String adviceUsers = (String) flowUser.get("adviceUserList");
List<String> adviceUserList = Arrays.asList(adviceUsers.split(","));
taskService.setVariable(taskId, "adviceUserList", adviceUserList);
@@ -370,6 +382,9 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
adviceService.saveBatch(advices);
break;
case CONTACT_USER_COLLECT:
data = revisionData.getData();
userMap.put("contactUserLeader", data.getContactUserLeader());
processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
case CONTACT_USER_LEADER_APPROVAL:
// 保存流程数据
data = revisionData.getData();
@@ -399,13 +414,14 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
String approvalUserStandard = data.getApprovalUserStandard();
List<String> relatedLeaderList = Arrays.asList(data.getRelatedLeader().split(","));
String chiefEngineer = data.getChiefEngineer();
userMap.put("proofreaderList", proofreaderList);
userMap.put("approvalUserList", approvalUserList);
userMap.put("approvalUserStandard", approvalUserStandard);
userMap.put("relatedLeaderList", relatedLeaderList);
userMap.put("otherDraftUserList", proofreaderList);
userMap.put("mainDraftUserLeaderList", approvalUserList);
userMap.put("standardizationUser", approvalUserStandard);
userMap.put("relatedDeptLeaderList", relatedLeaderList);
userMap.put("chiefEngineer", chiefEngineer);
taskService.setVariables(taskId, userMap);
saveOrUpdate(data);
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
break;
case MAIN_DRAFT_USER_RELEASE:
// do nothing now TODO 在线编辑 插入签章