diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java index d73c4235..959b6f84 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java @@ -181,22 +181,13 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl update = new LambdaUpdateWrapper<>(); - update.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId); - update.ne(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()); - update.eq(ProcessApprovalRecord::getNodeId,xmlNodeId); - update.set(ProcessApprovalRecord::getCommitText,"未处理"); - update.set(ProcessApprovalRecord::getCommitFlag,ActivitiCommon.COMMIT_FLAG3); - update.set(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.COMPLETE.getValue()); - update.set(ProcessApprovalRecord::getEndTime,new Date()); - processApprovalRecordService.update(update); - } + runtimeService.setVariable(processInstanceId, PASS, pass); // 审批节点 actFlowCommonService.completeTask(taskId, userId); + // 驳回,结束所有节点 + processApprovalRecordService.updateApprovalRecordFinishFlag(pass, taskId, xmlNodeId, processInstanceId); // 保存快照 // 获取流程通用数据 ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);