From 66f4bb59d4ecb219ef13654aafbcc64685b78739 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Tue, 11 Feb 2025 14:58:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E6=8F=90=E4=BA=A4=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=A0=A1=E9=AA=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChangeRecordServiceImpl.java | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

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 aee7360b..47512cef 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
@@ -1080,7 +1080,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
             AssertUtil.isTrue(req.getHappenTime().get(0).compareTo(req.getHappenTime().get(1)) < 0, "提出结束时间不能小于开始时间");
         }
         if (CollectionUtils.isNotEmpty(req.getApproveCompletedDate())) {
-            AssertUtil.isFalse(req.getApproveCompletedDate().size() < 2, "请填写审批完成范围");
+            AssertUtil.isFalse(req.getApproveCompletedDate().size() < 2, "请填写审批完成时间范围");
             AssertUtil.isTrue(req.getApproveCompletedDate().get(0).compareTo(req.getApproveCompletedDate().get(1)) < 0, "审批完成结束时间不能小于开始时间");
         }
     }
@@ -1116,9 +1116,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
 
     private void validVisaChangeForm(VisaChangeApproveCreateReq req) {
         // 单号项目内唯一性
-        ChangeRecord visaRecord = getById(req.getNo());
-        AssertUtil.isTrue(Objects.isNull(visaRecord) || !Objects.equals(visaRecord.getRelationWorkspaceId(), req.getRelationWorkspaceId()), "已存在相同单号的变更签证单据，请修改");
-        // 发生区域存在性 TODO
+        ChangeRecord visaRecord = getVisaByWorkspaceIdAndNo(req.getRelationWorkspaceId(), req.getNo());
+        AssertUtil.notNull(visaRecord, "已存在相同单号的变更签证单据，请修改");
         // 工程存在性
         ProjectDetailRes projectById = visaProjectApiGateway.getProjectById(req.getRelationProject());
         AssertUtil.notNull(projectById, "工程不存在");
@@ -1158,7 +1157,12 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
             });
         }
         // 金额变化合法性
-        AssertUtil.isTrue(req.getAmountChange().compareTo(maxAmount) <= 0 && req.getAmountChange().compareTo(minAmount) >= 0, "金额变化超出范围");
+        if (Objects.equals(req.getType(), VisaTypeEnum.PROJECT_VISA) && Objects.isNull(req.getAmountChange())) {
+            throw new ServiceException("请选择金额变化");
+        }
+        if (Objects.nonNull(req.getAmountChange())) {
+            AssertUtil.isTrue(req.getAmountChange().compareTo(maxAmount) <= 0 && req.getAmountChange().compareTo(minAmount) >= 0, "金额变化超出范围");
+        }
         // 关联单据合法性
         if (CollUtil.isNotEmpty(req.getRelationOrderMap())) {
             req.getRelationOrderMap().forEach((key, value) -> {
@@ -1195,6 +1199,14 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
         }
     }
 
+    private ChangeRecord getVisaByWorkspaceIdAndNo(Long workspaceId, String no) {
+        return lambdaQuery().eq(ChangeRecord::getNo, no)
+                .eq(ChangeRecord::getRelationWorkspaceId, workspaceId)
+                .eq(ChangeRecord::getIsDelete, 0)
+                .last("LIMIT 1")
+                .one();
+    }
+
     private void validBillIfRelated(VisaBillTypeEnum billType, List<Long> value, VisaTypeEnum visaType) {
         AssertUtil.notNull(billType, "关联单据类型不能为空");
         AssertUtil.notEmpty(value, "关联单据Id不能为空");