diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java index 987f5057..2ed8dbff 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java @@ -86,6 +86,7 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P String visaType = (String) dto.getVariables().getOrDefault(WORKFLOW_VAR_VISA_TYPE_KEY, ""); return StringUtils.hasText(visaType) ? VisaTypeEnum.valueOf(visaType).getDesc() : ""; } + @Override public void onCompleted(ProcessInstanceDTO dto) { String visaTypeDesc = parseVisaType(dto); @@ -157,15 +158,21 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P .eq(ChangeRecord::getIsDelete, 0) .oneOpt() .ifPresent(changeRecord -> { - changeRecord.setApprovalStatus(resultEnum.getStatus()); - changeRecord.setApprovalCompleteTime(new Date()); + if (Objects.equals(resultEnum, BpmnProcessInstanceResultEnum.APPROVED)) { + changeRecord.setApprovalStatus(resultEnum.getStatus()); + changeRecord.setApprovalCompleteTime(new Date()); + } else { + changeRecord.setApprovalId(""); + changeRecord.setApprovalStatus(""); + changeRecord.setApprovalCompleteTime(null); + } changeRecordService.updateById(changeRecord); }); // 更新关联表审批信息 changeRecordRelationService.lambdaQuery() .eq(ChangeRecordRelation::getVisaId, visaId) - .eq(ChangeRecordRelation::getVarName, PROCESS_INSTANCE.getCode()) + .eq(ChangeRecordRelation::getVarName, PROCESS_INSTANCE.name()) .eq(ChangeRecordRelation::getContent, dto.getProcessInstanceId()) .oneOpt() .ifPresent(changeRecordRelation -> { diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 26f21fb2..3bf809ed 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -733,9 +733,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl 0) { - amountDesc = "增加" + req.getAmountChange().toPlainString() + "元"; + amountDesc = "增加" + req.getAmountChange().abs().toPlainString() + "元"; } else if (req.getAmountChange().compareTo(BigDecimal.ZERO) < 0) { - amountDesc = "减少" + req.getAmountChange().toPlainString() + "元"; + amountDesc = "减少" + req.getAmountChange().abs().toPlainString() + "元"; } formVariables.put(FORM_FIELD_AMOUNT_CHANGE, amountDesc); } @@ -861,7 +861,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl