diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 05773a4f..ae12058c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -444,6 +444,21 @@ public class ActFlowCommonService { updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue()); updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName); updateWrapper.set(ProcessApprovalRecord::getCommitFlag, CommitFlagEnum.UNDISPOSED.getValue()); + updateWrapper.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()); + processApprovalRecordService.update(updateWrapper); + } + + /** + * 会签节点驳回后,将其余节点recode设置为 未处理 状态 + * @param prcId + * @param nodeName + */ + public void cleanOtherCountersignTask(String prcId, String nodeName) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, prcId); + updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue()); + updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName); + updateWrapper.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()); processApprovalRecordService.update(updateWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index 7072db63..48e8259a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -245,7 +245,11 @@ public class EsRevisionServiceImpl extends ServiceImpl otherDraftUserVOS = data.parseOtherDraftUserVOS(); List inspectContentVOS = data.parseInspectContents(); String xmlNodeId = record.getNodeId(); - boolean pass = (boolean) taskService.getVariable(taskId, "pass"); + Object passObject = taskService.getVariable(taskId, "pass"); + boolean pass = true; + if (passObject != null) { + pass = (boolean) passObject; + } // 某些节点需要对数据进行特殊处理 switch (xmlNodeId) { case OTHER_DRAFT_USER_UPLOAD: @@ -320,6 +324,8 @@ public class EsRevisionServiceImpl extends ServiceImpl flowUser; String contactUser = (String) runtimeService.getVariable(executionId, "contactUser"); + // 更新审批表为完成,填充数据 + actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass); switch (xmlNodeId) { case MAIN_DRAFT_USER_DISTRIBUTE: // 判断是否分发 设置流程变量 @@ -528,8 +534,6 @@ public class EsRevisionServiceImpl extends ServiceImpl