From b0a8fe24559628e02e4b0705d1b7355622364e38 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Thu, 27 Feb 2025 16:35:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E8=A1=A8=E5=8D=95=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=A8=A1=E5=9E=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visa/api/request/CheckVisaWithVisaIdReq.java     | 12 ++++++++++--
 .../visa/api/request/VisaChangeTempCreateReq.java    |  2 +-
 .../server/service/impl/ChangeRecordServiceImpl.java | 12 +++++++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java
index 4d9bf2af..536d2d59 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java
@@ -47,7 +47,15 @@ public class CheckVisaWithVisaIdReq {
                 AssertUtil.notEmpty(item.getRelationPersonList(), "确认人不能为空");
             });
         }
-
-
+    }
+    
+    public void check() {
+        AssertUtil.notNull(this.getCreatFormData().getRelationWorkspaceId(), "关联项目不能为空");
+        AssertUtil.notNull(this.getCreatFormData().getType(), "单据类型不能为空");
+        AssertUtil.notEmpty(this.getCreatFormData().getNo(), "单号不能为空");
+        AssertUtil.notEmpty(this.getCreatFormData().getTopic(), "主题不能为空");
+        AssertUtil.notNull(this.getCreatFormData().getRelationProject(), "关联工程不能为空");
+        AssertUtil.notNull(this.getCreatFormData().getHappenTime(), "提出时间不能为空");
+        AssertUtil.notEmpty(this.getCreatFormData().getReason(), "发生原因不能为空");
     }
 }
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 c63e693a..090c2871 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
@@ -85,7 +85,7 @@ public class VisaChangeTempCreateReq {
     /**
      * 提出时间
      */
-    @NotNull(message = "请选择提交日期")
+    @NotNull(message = "请选择提出时间")
     private Date happenTime;
 
     /**
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 a6c2d587..6d000b58 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
@@ -2009,9 +2009,15 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
      */
     @Override
     public void checkVisaWithVisaId(CheckVisaWithVisaIdReq req) {
-        VisaDetailByIdResponse response = this.detailById(req.getVisaId());
-        req.check(response);
-        this.validVisaChangeForm(Objects.requireNonNull(this.buildVisaChangeApproveCreateReqByVisaId(req.getVisaId())));
+        if (NumberUtil.isPositiveNumber(req.getVisaId())) {
+            VisaDetailByIdResponse response = this.detailById(req.getVisaId());
+            AssertUtil.notNull(response, "单据不存在");
+            req.check(response);
+            this.validVisaChangeForm(Objects.requireNonNull(this.buildVisaChangeApproveCreateReqByVisaId(req.getVisaId())));
+        } else {
+            req.check();
+            this.validVisaChangeForm(BeanUtil.copyProperties(req.getCreatFormData(), VisaChangeApproveCreateReq.class));
+        }
     }