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

fix: 制修订子流程

Browse Source
This commit is contained in:
mzaxd
2023-12-26 16:48:24 +08:00
parent 5ba3afa9ea
commit cb435e308b
1 changed files with 7 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/esRevision/service/impl/EsRevisionServiceImpl.java
+7 -3
View File
@@ -218,6 +218,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
advicesWrapper.eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId); advicesWrapper.eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId);
wrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId); wrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId);
ProcessEsRevision data = getOne(wrapper); ProcessEsRevision data = getOne(wrapper);
List<EsRevisionAdvice> adviceList = new ArrayList<>();
List<OtherDraftUserVO> otherDraftUserVOS = data.parseOtherDraftUserVOS(); List<OtherDraftUserVO> otherDraftUserVOS = data.parseOtherDraftUserVOS();
List<InspectContentVO> inspectContentVOS = data.parseInspectContents(); List<InspectContentVO> inspectContentVOS = data.parseInspectContents();
String xmlNodeId = record.getNodeId(); String xmlNodeId = record.getNodeId();
@@ -240,9 +241,12 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
case CONTACT_USER_COLLECT: case CONTACT_USER_COLLECT:
case CONTACT_USER_LEADER_APPROVAL: case CONTACT_USER_LEADER_APPROVAL:
advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId); advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
adviceList = adviceService.list(advicesWrapper);
break;
case MAIN_DRAFT_USER_COLLECT_FIRST:
adviceList = adviceService.list(advicesWrapper);
break; break;
} }
List<EsRevisionAdvice> adviceList = adviceService.list(advicesWrapper);
data.setAdvices(adviceList); data.setAdvices(adviceList);
data.setOtherDraftUserVOS(otherDraftUserVOS); data.setOtherDraftUserVOS(otherDraftUserVOS);
data.setInspectContents(inspectContentVOS); data.setInspectContents(inspectContentVOS);
@@ -414,8 +418,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
.eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId) .eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId)
.eq(EsRevisionAdvice::getExecutionId, executionId)); .eq(EsRevisionAdvice::getExecutionId, executionId));
advices = data.getAdvices(); advices = data.getAdvices();
advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId)); adviceWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
advices.forEach(advice -> advice.setExecutionId(executionId)); adviceService.remove(adviceWrapper);
adviceService.saveBatch(advices); adviceService.saveBatch(advices);
break; break;
case MAIN_DRAFT_USER_COLLECT_SECOND: case MAIN_DRAFT_USER_COLLECT_SECOND: