diff --git a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java index 60f8b11..6cf3fb7 100644 --- a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java +++ b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java @@ -49,7 +49,7 @@ public class ApplyCompletionAction implements Action { //validator.validate(verifyData); // 新增审批数据 Negative negative = negativeService.getById(actionDto.getNegativeId()); - updateNegative(actionDto.getNegativeId(), actionDto.getNextFlowKey(), verifyData, negative); + updateNegative(actionDto.getNegativeId(), verifyData, negative); doneWork(actionDto.getWorkId()); addWork(actionDto.getNegativeId(), actionDto.getWorkId(), // 是否是本级办理 @@ -57,11 +57,11 @@ public class ApplyCompletionAction implements Action { negative); } - public void updateNegative(String negativeId, String nextFlowKey, VerifyData verifyData, Negative negative) { + public void updateNegative(String negativeId, VerifyData verifyData, Negative negative) { LocalDateTime now = LocalDateTime.now(); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() .eq(Negative::getId, negativeId) - .set(Negative::getFlowKey, nextFlowKey) + .set(Negative::getFlowKey, negative.getIsSecondHandle() ? FlowNodeEnum.FIRST_APPROVE.getKey() : FlowNodeEnum.SECOND_APPROVE.getKey()) .set(Negative::getUpdTime, now) .set(Negative::getProcessingStatus, ProcessingStatusEnum.approval.name()) .set(Negative::getCheckStatus, verifyData.getCheckStatus())