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

fix: 年度制修订标准化发起BUG修改

Browse Source
This commit is contained in:
mzaxd
2023-12-14 09:18:39 +08:00
parent 95807ef346
commit dacdb57239
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+10 -10
View File
@@ -132,8 +132,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
Map<String, Object> actVariables = new HashMap<>(); Map<String, Object> actVariables = new HashMap<>();
Map<String, Object> flowUser = annualInitData.getFlowUser(); Map<String, Object> flowUser = annualInitData.getFlowUser();
List<ProcessEsAnnualInit> dataList = annualInitData.getDataList(); List<ProcessEsAnnualInit> dataList = annualInitData.getDataList();
List<String> contactUserList = dataList.stream().map(ProcessEsAnnualInit::getContactUser).collect(Collectors.toList()); Set<String> contactUserSet = dataList.stream().map(ProcessEsAnnualInit::getContactUser).collect(Collectors.toSet());
actVariables.put("contactUserList", contactUserList); actVariables.put("contactUserList", contactUserSet);
actVariables.put("standardEngineer", flowUser.get("standardEngineer")); actVariables.put("standardEngineer", flowUser.get("standardEngineer"));
return actVariables; return actVariables;
} }
@@ -234,7 +234,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
public void approvalProcess(AnnualInitDataVO annualInitData, boolean pass) { public void approvalProcess(AnnualInitDataVO annualInitData, boolean pass) {
String userId = UserUtils.getUserId(); String userId = UserUtils.getUserId();
CommonVO commonVO = annualInitData.getCommonVO(); CommonVO commonVO = annualInitData.getCommonVO();
List<ProcessEsAnnualInit> dataList = annualInitData.getDataList();
String taskId = commonVO.getTaskId(); String taskId = commonVO.getTaskId();
// 获取task // 获取task
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) { if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
@@ -245,30 +244,27 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
String executionId = task.getExecutionId(); String executionId = task.getExecutionId();
String taskName = task.getName(); String taskName = task.getName();
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
List<ProcessEsAnnualInit> dataList;
switch (taskName) { switch (taskName) {
case CONTACT_USER_SELECT: case CONTACT_USER_SELECT:
dataList = annualInitData.getDataList();
// 处理驳回 // 处理驳回
if (pass) { if (pass) {
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue())); dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
List<String> approvalUserList = new ArrayList<>(); List<String> approvalUserList = new ArrayList<>();
dataList.forEach(d -> approvalUserList.add(d.getApprovalUser())); dataList.forEach(d -> approvalUserList.add(d.getApprovalUser()));
taskService.setVariable(taskId, "approvalUserList", approvalUserList); taskService.setVariable(taskId, "approvalUserList", approvalUserList);
} else {
// 更新所有数据为驳回
LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
dataList = list(wrapper);
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue()));
} }
dataList.forEach(data -> data.setExecutionId(executionId)); dataList.forEach(data -> data.setExecutionId(executionId));
saveOrUpdateBatch(dataList); saveOrUpdateBatch(dataList);
break; break;
case STANDARD_ENGINEER_EDIT: case STANDARD_ENGINEER_EDIT:
dataList = annualInitData.getDataList();
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue())); dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
saveOrUpdateBatch(dataList); saveOrUpdateBatch(dataList);
break; break;
case MAIN_DRAFT_LEADER_APPROVAL: case MAIN_DRAFT_LEADER_APPROVAL:
dataList = annualInitData.getDataList();
// 如果不驳回 // 如果不驳回
if (pass) { if (pass) {
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue())); dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
@@ -284,13 +280,16 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
saveOrUpdateBatch(dataList); saveOrUpdateBatch(dataList);
break; break;
case MAIN_DRAFT_WRITE: case MAIN_DRAFT_WRITE:
dataList = annualInitData.getDataList();
dataList.forEach(d -> d.setMainDraftingUser(userId)); dataList.forEach(d -> d.setMainDraftingUser(userId));
saveOrUpdateBatch(dataList); saveOrUpdateBatch(dataList);
break; break;
case CONTACT_USER_COLLECT: case CONTACT_USER_COLLECT:
dataList = annualInitData.getDataList();
saveOrUpdateBatch(dataList); saveOrUpdateBatch(dataList);
break; break;
case MAIN_DRAFT_LEADER_LEADER_APPROVAL: case MAIN_DRAFT_LEADER_LEADER_APPROVAL:
dataList = annualInitData.getDataList();
// 如果不驳回 // 如果不驳回
if (pass) { if (pass) {
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue())); dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
@@ -303,6 +302,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
break; break;
case STANDARD_ENGINEER_COLLECT: case STANDARD_ENGINEER_COLLECT:
// 根据流程ID删除所有数据后新增 // 根据流程ID删除所有数据后新增
dataList = annualInitData.getDataList();
LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId); wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
remove(wrapper); remove(wrapper);