From e25d227d1fbf16065622cd66b4fe41741d4fd232 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 11 Feb 2025 14:28:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E9=87=91=E9=A2=9D=E7=9A=84=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/request/VisaChangeTempCreateReq.java     |  1 -
 .../service/impl/ChangeRecordServiceImpl.java    | 16 ++++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java
index 6d62f980..fcc9cee0 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java
@@ -127,7 +127,6 @@ public class VisaChangeTempCreateReq {
     /**
      * 有符号的变更金额
      */
-    @NotNull(message = "变更金额不能为空")
     private BigDecimal amountChange;
 
     /**
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 2340ab75..aee7360b 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
@@ -702,13 +702,17 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
         formVariables.put(FORM_FIELD_REASON, req.getReason());
         formVariables.put(FORM_FIELD_RELATION_AREA, visaHelper.buildAreaName(req.getRelationArea()));
         formVariables.put(FORM_FIELD_CONTEXT_DESCRIPTION, req.getChangeContextAndDescriptionList());
-        String amountDesc = "不变";
-        if (req.getAmountChange().compareTo(BigDecimal.ZERO) > 0) {
-            amountDesc = "增加" + req.getAmountChange().toPlainString() + "元";
-        } else if (req.getAmountChange().compareTo(BigDecimal.ZERO) < 0) {
-            amountDesc = "减少" + req.getAmountChange().toPlainString() + "元";
+
+        // 非必填项
+        if (Objects.nonNull(req.getAmountChange())) {
+            String amountDesc = "不变";
+            if (req.getAmountChange().compareTo(BigDecimal.ZERO) > 0) {
+                amountDesc = "增加" + req.getAmountChange().toPlainString() + "元";
+            } else if (req.getAmountChange().compareTo(BigDecimal.ZERO) < 0) {
+                amountDesc = "减少" + req.getAmountChange().toPlainString() + "元";
+            }
+            formVariables.put(FORM_FIELD_AMOUNT_CHANGE, amountDesc);
         }
-        formVariables.put(FORM_FIELD_AMOUNT_CHANGE, amountDesc);
 
         // 三种单据
         if (MapUtils.isNotEmpty(req.getRelationOrderMap())) {