From 18b9e58cf004b2a84f16b522460e06384b0c34a0 Mon Sep 17 00:00:00 2001
From: wangli <wangli@axzo.cn>
Date: Sat, 15 Feb 2025 12:51:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300)=20-=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=BB=93=E6=9E=9C=E7=9B=91=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/ProcessInstanceAllEventHandler.java     | 13 ++++++++++---
 .../service/impl/ChangeRecordServiceImpl.java       |  6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

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<ChangeRecordDao, Change
         if (Objects.nonNull(req.getAmountChange())) {
             String amountDesc = "不变";
             if (req.getAmountChange().compareTo(BigDecimal.ZERO) > 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<ChangeRecordDao, Change
         // 设置关联表的审批信息
         ChangeRecordRelation processRelation = new ChangeRecordRelation();
         processRelation.setVisaId(visaId);
-        processRelation.setVarName(VisaRelationFieldEnum.PROCESS_INSTANCE.getCode());
+        processRelation.setVarName(VisaRelationFieldEnum.PROCESS_INSTANCE.name());
         processRelation.setVarType(VisaRelationVarTypeEnum.STRING.getType());
         processRelation.setContent(processInstanceId);
         processRelation.setContentExt(PROCESSING.getStatus());