diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index e33fdf29..16d931ff 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -172,6 +172,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl data.setContactUserLeaderLeader(contactUserLeaderLeader)); dataList.forEach(data -> data.setExecutionId(executionId)); dataList.forEach(data -> data.setProcessInstanceId(processInstanceId)); - dataList.forEach(data -> data.setContactUser(contactUser)); + dataList.forEach(data -> data.setContactUser(curContactUser)); // 不分发,入库存表 saveBatch(dataList); taskService.setVariable(taskId, "contactUserLeaderLeader", contactUserLeaderLeader); } - taskService.setVariable(taskId, contactUser + "-ContactUserLeaderLeader", contactUserLeaderLeader); + taskService.setVariable(taskId, curContactUser + "-ContactUserLeaderLeader", contactUserLeaderLeader); userVariable.put("contactUserLeaderLeader", contactUserLeaderLeader); processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userVariable); + // 转办 + runtimeService.setVariable(executionId, "contactUser", curContactUser); break; case WORK_GROUP_COLLECT: // 先删后增 @@ -211,13 +214,20 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl data.setCollectUserLeader(collectUserLeader)); dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader)); - dataList.forEach(data -> data.setWorkGroupUser(workGroupUser)); + String curWorkGroupUser = UserUtils.getUserId(); + dataList.forEach(data -> data.setWorkGroupUser(curWorkGroupUser)); saveBatch(dataList); + // 转办 + runtimeService.setVariable(executionId, "workGroupUser", curWorkGroupUser); // 设置下一个节点的审批人流程变量 taskService.setVariable(taskId, "collectUserLeader", collectUserLeader); userVariable.put("collectUserLeader", collectUserLeader); processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userVariable); break; + case COLLECT_LEADER_APPROVAL: + // 转办 + runtimeService.setVariable(executionId, "collectUserLeader", UserUtils.getUserId()); + break; case CONTACT_USER_COLLECT: // 先删后增 wrapper.eq(ProcessEsAnnualReport::getContactUser, contactUser); @@ -232,6 +242,12 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl transfer(@RequestBody TransferVO transferVO) { - initChangeService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId()); return Result.OK(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java index de0bc60e..714bd089 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java @@ -33,12 +33,6 @@ public interface ProcessEsInitChangeService extends IService initChangeData); - /** - * 软删除实例数据 - * @param processInstanceId - */ - void removeByProcessInstanceId(String processInstanceId); - /** * 获取办理数据 * @param taskId @@ -53,10 +47,4 @@ public interface ProcessEsInitChangeService extends IService updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId).set(ProcessEsInitChange::getDelFlag, YesOrNoEnum.YES.getValue()); - update(updateWrapper); - } - @Override public List getSequenceNumbers(String esCodeDictValue, String esNameCodeDictValue, String categoryCodeDictValue) { // 已经存在的标准 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java index 5e558a72..14ac9265 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java @@ -134,7 +134,7 @@ public class ESRecheckController { @ApiOperation(value="企标复审流程-转办", notes="企标复审流程-转办") @PostMapping(value = "/transfer") public Result transfer(@RequestBody TransferVO transferVO) { - recheckService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId()); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java index 64e645cb..01dc5e12 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java @@ -22,5 +22,4 @@ public interface ProcessEsRecheckService extends IService { void approval(ESRecheckDataVO recheckData, boolean pass); - void transfer(String taskId, String userId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java index 1de31c5e..61241f4a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java @@ -210,7 +210,7 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl variables = recheckData.getFlowUser(); - // 设置第联络人节点人员 + // 设置联络人节点人员 actFlowCommonService.putIfNotNull(variables, "standardizationUser", data.getStandardizationUser()); // 设置流程变量 Map actVariables = this.setVariables(variables); @@ -238,6 +238,16 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl reviewMeetingDetails = data.getReviewMeetingDetails(); // 设置当前评分人 curUserId = UserUtils.getUserId(); - reviewMeetingDetails.forEach(reviewMeetingDetail -> reviewMeetingDetail.setAdjudicatorId(curUserId)); + String finalCurUserId = curUserId; + reviewMeetingDetails.forEach(reviewMeetingDetail -> reviewMeetingDetail.setAdjudicatorId(finalCurUserId)); ProcessEsRevision revisionDb = getById(dataDb.getId()); List reviewMeetingDetailsDb = revisionDb.parseReviewMeetingDetails(); if (reviewMeetingDetailsDb == null) { @@ -530,56 +531,40 @@ public class EsRevisionServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId) - .set(ProcessEsRevision::getApprovalUser, toUserId); - update(updateWrapper); - } processHandleService.transfer(taskId, toUserId); }