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-19 14:13:07 +08:00
parent 3232517d20
commit 32eaa457c2
1 changed files with 1 additions and 3 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
+1 -3
View File
@@ -222,7 +222,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
break; break;
case CONTACT_USER_EDIT: case CONTACT_USER_EDIT:
wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser); 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:
@@ -306,7 +305,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
break; break;
case STANDARD_ENGINEER_SECOND_EDIT: case STANDARD_ENGINEER_SECOND_EDIT:
dataList = annualInitData.getDataList(); dataList = annualInitData.getDataList();
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue())); dataList.forEach(d -> d.setRejectSecondFlag(YesOrNoEnum.NO.getValue()));
// 先删后增 // 先删后增
if (batchDelFlag) { if (batchDelFlag) {
saveOrUpdateBatch(dataList); saveOrUpdateBatch(dataList);
@@ -316,7 +315,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
wrapper.eq(ProcessEsAnnualInit::getRejectSecondFlag, YesOrNoEnum.YES.getValue()); wrapper.eq(ProcessEsAnnualInit::getRejectSecondFlag, YesOrNoEnum.YES.getValue());
remove(wrapper); remove(wrapper);
dataList.forEach(data -> data.setProcessInstanceId(processInstanceId)); dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
dataList.forEach(data -> data.setExecutionId(executionId));
saveBatch(dataList); saveBatch(dataList);
} }
break; break;