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-08 14:53:21 +08:00
parent 850d74eb78
commit d523ab2944
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+8 -6
View File
@@ -116,7 +116,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
CommonVO commonVO = annualReportData.getCommonVO(); CommonVO commonVO = annualReportData.getCommonVO();
Map<String, Object> flowUser = annualReportData.getFlowUser(); Map<String, Object> flowUser = annualReportData.getFlowUser();
actFlowCommonService.putIfNotNull(actVariables, "contactUserList", actFlowCommonService.putIfNotNull(actVariables, "contactUserList",
Optional.ofNullable((String)flowUser.get("contactUserList")) Optional.ofNullable((String) flowUser.get("contactUserList"))
.map(s -> Arrays.asList(s.split(","))) .map(s -> Arrays.asList(s.split(",")))
.orElse(null)); .orElse(null));
actVariables.put("standardEngineer", flowUser.get("standardEngineer")); actVariables.put("standardEngineer", flowUser.get("standardEngineer"));
@@ -151,17 +151,19 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId); String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
switch (taskName) { switch (taskName) {
case CONTACT_USER_DISTRIBUTE: case CONTACT_USER_DISTRIBUTE:
boolean distribute = (boolean) flowUserVO.get("distribute"); ProcessEsAnnualReport annualReport = annualReportDataVO.getDataList().get(0);
boolean distribute = annualReport.getDistributeFlag().equals("1");
String contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();
taskService.setVariableLocal(taskId, "distribute", distribute); taskService.setVariableLocal(taskId, "distribute", distribute);
// 获取是否分发 // 获取是否分发
if (distribute) { if (distribute) {
String workGroupUsers = (String)flowUserVO.get("workGroupUserList"); String workGroupUsers = annualReport.getWorkGroupUser();
// 将workGroupUserList从逗号拼接转为List // 将workGroupUserList从逗号拼接转为List
List<String> workGroupUserList = StrUtil.split(workGroupUsers, ','); List<String> workGroupUserList = StrUtil.split(workGroupUsers, ',');
// 设置流程变量 // 设置流程变量
taskService.setVariableLocal(taskId, "workGroupUserList", workGroupUserList); taskService.setVariableLocal(taskId, "workGroupUserList", workGroupUserList);
}else { taskService.setVariableLocal(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);
String contactUserLeaderLeader = (String)flowUserVO.get("contactUserLeaderLeader"); } else {
// 保存联络人主管级上级领导 // 保存联络人主管级上级领导
dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader)); dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
// 不分发，入库存表 // 不分发，入库存表
@@ -174,7 +176,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
String contactUser = (String) runtimeService.getVariable(executionId, "contactUser"); String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
dataList.forEach(data -> data.setContactUser(contactUser)); dataList.forEach(data -> data.setContactUser(contactUser));
// 保存收集联络人主管级领导 // 保存收集联络人主管级领导
dataList.forEach(data -> data.setCollectUserLeader((String)flowUserVO.get("collectUserLeader"))); dataList.forEach(data -> data.setCollectUserLeader((String) flowUserVO.get("collectUserLeader")));
dataList.forEach(data -> data.setWorkGroupUser(UserUtils.getUserId())); dataList.forEach(data -> data.setWorkGroupUser(UserUtils.getUserId()));
saveBatch(dataList); saveBatch(dataList);
// 设置下一个节点的审批人流程变量 // 设置下一个节点的审批人流程变量