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-18 09:07:57 +08:00
parent bdd514b395
commit cbda282732
1 changed files with 19 additions and 4 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
+19 -4
View File
@@ -210,6 +210,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String taskName = task.getName(); String taskName = task.getName();
String contactUser = (String) runtimeService.getVariable(executionId, "contactUser"); String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
String approvalUser = (String) runtimeService.getVariable(executionId, "approvalUser");
switch (taskName) { switch (taskName) {
case CONTACT_USER_SELECT: case CONTACT_USER_SELECT:
wrapper.eq(ProcessEsAnnualInit::getContactUser, userId); wrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
@@ -223,9 +224,12 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
wrapper.eq(ProcessEsAnnualInit::getApprovalUser, userId); wrapper.eq(ProcessEsAnnualInit::getApprovalUser, userId);
break; break;
case CONTACT_USER_EDIT: case CONTACT_USER_EDIT:
wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
wrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser);
wrapper.eq(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue()); wrapper.eq(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
break; break;
case MAIN_DRAFT_WRITE: case MAIN_DRAFT_WRITE:
wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
wrapper.eq(ProcessEsAnnualInit::getPrcMainDraftUser, userId); wrapper.eq(ProcessEsAnnualInit::getPrcMainDraftUser, userId);
break; break;
case CONTACT_USER_COLLECT: case CONTACT_USER_COLLECT:
@@ -268,6 +272,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
wrapper.eq(ProcessEsAnnualInit::getDelFlag, YesOrNoEnum.NO.getValue()); wrapper.eq(ProcessEsAnnualInit::getDelFlag, YesOrNoEnum.NO.getValue());
updateWrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId); updateWrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
updateWrapper.eq(ProcessEsAnnualInit::getDelFlag, YesOrNoEnum.NO.getValue()); updateWrapper.eq(ProcessEsAnnualInit::getDelFlag, YesOrNoEnum.NO.getValue());
String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
String approvalUser = (String) runtimeService.getVariable(executionId, "approvalUser");
switch (taskName) { switch (taskName) {
case CONTACT_USER_SELECT: case CONTACT_USER_SELECT:
dataList = annualInitData.getDataList(); dataList = annualInitData.getDataList();
@@ -284,6 +290,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
// 找到所有数据，然后设置驳回标志位 // 找到所有数据，然后设置驳回标志位
updateWrapper.eq(ProcessEsAnnualInit::getContactUser, userId); updateWrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
updateWrapper.set(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue()); updateWrapper.set(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
updateWrapper.set(ProcessEsAnnualInit::getExecutionId, executionId);
update(updateWrapper); update(updateWrapper);
} else { } else {
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue())); dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue()));
@@ -308,12 +315,20 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
dataList.forEach(data -> data.setExecutionId(executionId)); dataList.forEach(data -> data.setExecutionId(executionId));
taskService.setVariable(taskId, "mainDraftUserList", mainDraftUserSet); taskService.setVariable(taskId, "mainDraftUserList", mainDraftUserSet);
} else { } else {
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue())); // 找到对应数据，然后设置驳回标志位
updateWrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
updateWrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser);
updateWrapper.set(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
update(updateWrapper);
} }
// 获取执行id
dataList.forEach(data -> data.setExecutionId(executionId));
saveOrUpdateBatch(dataList);
break; break;
case CONTACT_USER_EDIT:
dataList = annualInitData.getDataList();
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
taskService.setVariable(taskId, "approvalUser", annualInitData.getDataList().get(0).getApprovalUser());
dataList.forEach(data -> data.setExecutionId(executionId));
dataList.forEach(data -> data.setApprovalUser(annualInitData.getDataList().get(0).getApprovalUser()));
saveOrUpdateBatch(dataList);
case MAIN_DRAFT_WRITE: case MAIN_DRAFT_WRITE:
dataList = annualInitData.getDataList(); dataList = annualInitData.getDataList();
dataList.forEach(d -> d.setMainDraftingUser(userId)); dataList.forEach(d -> d.setMainDraftingUser(userId));