feat: 标准化发起流程二级驳回
This commit is contained in:
+19
-4
@@ -210,6 +210,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
|
||||
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
|
||||
String taskName = task.getName();
|
||||
String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
|
||||
String approvalUser = (String) runtimeService.getVariable(executionId, "approvalUser");
|
||||
switch (taskName) {
|
||||
case CONTACT_USER_SELECT:
|
||||
wrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
|
||||
@@ -223,9 +224,12 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
|
||||
wrapper.eq(ProcessEsAnnualInit::getApprovalUser, userId);
|
||||
break;
|
||||
case CONTACT_USER_EDIT:
|
||||
wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
|
||||
wrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser);
|
||||
wrapper.eq(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
|
||||
break;
|
||||
case MAIN_DRAFT_WRITE:
|
||||
wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
|
||||
wrapper.eq(ProcessEsAnnualInit::getPrcMainDraftUser, userId);
|
||||
break;
|
||||
case CONTACT_USER_COLLECT:
|
||||
@@ -268,6 +272,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
|
||||
wrapper.eq(ProcessEsAnnualInit::getDelFlag, YesOrNoEnum.NO.getValue());
|
||||
updateWrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
|
||||
updateWrapper.eq(ProcessEsAnnualInit::getDelFlag, YesOrNoEnum.NO.getValue());
|
||||
String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
|
||||
String approvalUser = (String) runtimeService.getVariable(executionId, "approvalUser");
|
||||
switch (taskName) {
|
||||
case CONTACT_USER_SELECT:
|
||||
dataList = annualInitData.getDataList();
|
||||
@@ -284,6 +290,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
|
||||
// 找到所有数据,然后设置驳回标志位
|
||||
updateWrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
|
||||
updateWrapper.set(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
|
||||
updateWrapper.set(ProcessEsAnnualInit::getExecutionId, executionId);
|
||||
update(updateWrapper);
|
||||
} else {
|
||||
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue()));
|
||||
@@ -308,12 +315,20 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
|
||||
dataList.forEach(data -> data.setExecutionId(executionId));
|
||||
taskService.setVariable(taskId, "mainDraftUserList", mainDraftUserSet);
|
||||
} 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;
|
||||
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:
|
||||
dataList = annualInitData.getDataList();
|
||||
dataList.forEach(d -> d.setMainDraftingUser(userId));
|
||||
|
||||
Reference in New Issue
Block a user