From a28acc123bb733dab83390cfddc65617c7515cde Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Thu, 16 Jan 2025 17:14:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E6=B7=BB=E5=8A=A0=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E7=AD=BE=E8=AF=81=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/changerecord/ChangeRecordApi.java     | 11 +++
 .../visa/api/req/VisaChangePageSearchReq.java | 75 +++++++++++++++++++
 .../visa/api/req/VisaChangeTempCreateReq.java | 12 ++-
 .../response/VisaChangePageSearchResp.java    | 18 +++++
 4 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 visa/visa-api/src/main/java/cn/axzo/visa/api/req/VisaChangePageSearchReq.java
 create mode 100644 visa/visa-api/src/main/java/cn/axzo/visa/api/response/VisaChangePageSearchResp.java

diff --git a/visa/visa-api/src/main/java/cn/axzo/visa/api/changerecord/ChangeRecordApi.java b/visa/visa-api/src/main/java/cn/axzo/visa/api/changerecord/ChangeRecordApi.java
index 23870aa4..707b0381 100644
--- a/visa/visa-api/src/main/java/cn/axzo/visa/api/changerecord/ChangeRecordApi.java
+++ b/visa/visa-api/src/main/java/cn/axzo/visa/api/changerecord/ChangeRecordApi.java
@@ -3,7 +3,9 @@ package cn.axzo.visa.api.changerecord;
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.visa.api.req.VisaChangeApproveCreateReq;
 import cn.axzo.visa.api.req.VisaChangeDiscussCreateReq;
+import cn.axzo.visa.api.req.VisaChangePageSearchReq;
 import cn.axzo.visa.api.req.VisaChangeTempCreateReq;
+import cn.axzo.visa.api.response.VisaChangePageSearchResp;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -44,4 +46,13 @@ public interface ChangeRecordApi {
     @PostMapping("/api/visa/change/approveCreate")
     ApiResult<Long> approveCreateVisaChangeRecord(@RequestBody @Validated VisaChangeApproveCreateReq req);
 
+    /**
+     * 分页搜索
+     *
+     * @param req {@link VisaChangePageSearchReq} 筛查条件
+     * @return 分页记录
+     */
+    @PostMapping("/api/visa/change/pageSearch")
+    ApiResult<VisaChangePageSearchResp> pageSearchVisaChangeRecord(@RequestBody @Validated VisaChangePageSearchReq req);
+
 }
diff --git a/visa/visa-api/src/main/java/cn/axzo/visa/api/req/VisaChangePageSearchReq.java b/visa/visa-api/src/main/java/cn/axzo/visa/api/req/VisaChangePageSearchReq.java
new file mode 100644
index 00000000..a3f89e17
--- /dev/null
+++ b/visa/visa-api/src/main/java/cn/axzo/visa/api/req/VisaChangePageSearchReq.java
@@ -0,0 +1,75 @@
+package cn.axzo.visa.api.req;
+
+import cn.axzo.visa.api.enums.VisaStatusEnum;
+import cn.axzo.visa.api.enums.VisaTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author chenwenjian
+ * @version 1.0
+ * @date 2025/1/16 15:46
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class VisaChangePageSearchReq {
+
+    /**
+     * 单据类型
+     */
+    private VisaTypeEnum type;
+
+    /**
+     * 单号或主题
+     * <p>
+     * 单号精确搜索，主题模糊搜索
+     * </p>
+     */
+    private String keyword;
+
+    /**
+     * 所属工程
+     */
+    private Long projectId;
+
+    /**
+     * 发起人
+     */
+    private List<Long> initiators;
+
+    /**
+     * 状态
+     */
+    private List<VisaStatusEnum> statuses;
+
+    /**
+     * 变更金额区间
+     * 0：最小值 1：最大值
+     */
+    private List<BigDecimal> amountChange;
+
+    /**
+     * 提交时间区间
+     * 0：起始时间 1：结束时间
+     */
+    private List<Date> submitDate;
+
+    /**
+     * 审批完成时间区间
+     * 0：起始时间 1：结束时间
+     */
+    private List<Date> approveCompletedDate;
+
+    private Long page;
+
+    private Long pageSize;
+
+}
diff --git a/visa/visa-api/src/main/java/cn/axzo/visa/api/req/VisaChangeTempCreateReq.java b/visa/visa-api/src/main/java/cn/axzo/visa/api/req/VisaChangeTempCreateReq.java
index 6249bfbb..c711ec26 100644
--- a/visa/visa-api/src/main/java/cn/axzo/visa/api/req/VisaChangeTempCreateReq.java
+++ b/visa/visa-api/src/main/java/cn/axzo/visa/api/req/VisaChangeTempCreateReq.java
@@ -1,5 +1,6 @@
 package cn.axzo.visa.api.req;
 
+import cn.axzo.visa.api.enums.VisaRelationFieldEnum;
 import cn.axzo.visa.api.enums.VisaTypeEnum;
 import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
@@ -61,7 +62,7 @@ public class VisaChangeTempCreateReq {
     private JSONObject relationArea;
 
     /**
-     * 提交日期
+     * 提出日期
      */
     @NotNull(message = "请选择提交日期")
     private Date submitDate;
@@ -102,9 +103,11 @@ public class VisaChangeTempCreateReq {
     /**
      * 关联的单据，key: 单据类型，value: 单据id集合
      * <p>
-     * TASK ：任务单 RECTIFY ：整改单 CHANGE：变更单
+     * TASK_ORDER ：任务单 RECTIFICATION_ORDER ：整改单 VISA_ORDER：变更单
      * 只有变更签证类型即{@code type}为“技术核定”或“工程签证”时才可能会有关联变更单
      * </p>
+     *
+     * @see VisaRelationFieldEnum
      */
     private Map<String, List<Long>> relationOrderMap;
 
@@ -114,6 +117,11 @@ public class VisaChangeTempCreateReq {
     @Size(max = 30, message = "最多支持上传30个附件，已超出请重新选择")
     private List<String> attach;
 
+    /**
+     * 操作人peronId
+     */
+    private Long operator;
+
     @Data
     @Builder
     @NoArgsConstructor
diff --git a/visa/visa-api/src/main/java/cn/axzo/visa/api/response/VisaChangePageSearchResp.java b/visa/visa-api/src/main/java/cn/axzo/visa/api/response/VisaChangePageSearchResp.java
new file mode 100644
index 00000000..df80bbed
--- /dev/null
+++ b/visa/visa-api/src/main/java/cn/axzo/visa/api/response/VisaChangePageSearchResp.java
@@ -0,0 +1,18 @@
+package cn.axzo.visa.api.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chenwenjian
+ * @version 1.0
+ * @date 2025/1/16 16:29
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class VisaChangePageSearchResp {
+}