Browse Source

fix: 修复本级办理导致的审批流程异常

main
wxc 1 year ago
parent
commit
371c5cabe1
  1. 6
      src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java

6
src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java

@ -49,7 +49,7 @@ public class ApplyCompletionAction implements Action {
//validator.validate(verifyData); //validator.validate(verifyData);
// 新增审批数据 // 新增审批数据
Negative negative = negativeService.getById(actionDto.getNegativeId()); Negative negative = negativeService.getById(actionDto.getNegativeId());
updateNegative(actionDto.getNegativeId(), actionDto.getNextFlowKey(), verifyData, negative); updateNegative(actionDto.getNegativeId(), verifyData, negative);
doneWork(actionDto.getWorkId()); doneWork(actionDto.getWorkId());
addWork(actionDto.getNegativeId(), actionDto.getWorkId(), addWork(actionDto.getNegativeId(), actionDto.getWorkId(),
// 是否是本级办理 // 是否是本级办理
@ -57,11 +57,11 @@ public class ApplyCompletionAction implements Action {
negative); 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(); LocalDateTime now = LocalDateTime.now();
LambdaUpdateWrapper<Negative> updateWrapper = new LambdaUpdateWrapper<Negative>() LambdaUpdateWrapper<Negative> updateWrapper = new LambdaUpdateWrapper<Negative>()
.eq(Negative::getId, negativeId) .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::getUpdTime, now)
.set(Negative::getProcessingStatus, ProcessingStatusEnum.approval.name()) .set(Negative::getProcessingStatus, ProcessingStatusEnum.approval.name())
.set(Negative::getCheckStatus, verifyData.getCheckStatus()) .set(Negative::getCheckStatus, verifyData.getCheckStatus())

Loading…
Cancel
Save