From 19a143355fee794a8f899071a972e0a8c3632abe Mon Sep 17 00:00:00 2001
From: wb3298 <1111@qq.com>
Date: Mon, 24 Mar 2025 15:17:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2/cat/project/ProjectService.java        | 14 ++++++-
 .../ProjectCollectRecordQueryRequest.java     | 42 +++++++++++++++++--
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/ProjectService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/ProjectService.java
index f972238..14ce1cc 100644
--- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/ProjectService.java
+++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/ProjectService.java
@@ -151,12 +151,11 @@ public class ProjectService {
                 request.toJsonRequest(), ProjectCollectContractDeleteResponse.class);
         return httpResponse.getServiceResponse();
     }
-
     /**
      * 项目归集协议分页查询
      */
     public ProjectCollectContractQueryResponse collectQuery (ProjectCollectContractQueryRequest request){
-        String url = "/project_record/query";
+        String url = "/project_collect/query";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_2);
         HttpResponse<ProjectCollectContractQueryResponse> httpResponse = apiClient.post(url, headers,
@@ -164,5 +163,16 @@ public class ProjectService {
         return httpResponse.getServiceResponse();
     }
 
+    /**
+     * 项目资金归集记录分页查询
+     */
+    public ProjectCollectRecordQueryResponse recordQuery (ProjectCollectRecordQueryRequest request){
+        String url = "/project_record/query";
+        HttpHeaders headers = new HttpHeaders();
+        headers.addHeader(API_VERSION, V_2);
+        HttpResponse<ProjectCollectRecordQueryResponse> httpResponse = apiClient.post(url, headers,
+                request.toJsonRequest(), ProjectCollectRecordQueryResponse.class);
+        return httpResponse.getServiceResponse();
+    }
 
 }
diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/ProjectCollectRecordQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/ProjectCollectRecordQueryRequest.java
index f2fd6d2..bb345bb 100644
--- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/ProjectCollectRecordQueryRequest.java
+++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/ProjectCollectRecordQueryRequest.java
@@ -6,6 +6,8 @@ import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 /**
  * 项目资金归集记录分页查询
  *
@@ -16,21 +18,37 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TransType("311101")
 public class ProjectCollectRecordQueryRequest implements PageApiRequest {
+
     /**
      * 归集协议编号
      */
     @SerializedName("collect_no")
     private String collectNo;
+
     /**
      * 项目编号
      */
     @SerializedName("project_no")
     private String projectNo;
+
     /**
      * 项目名称
      */
     @SerializedName("project_name")
     private String projectName;
+
+    /**
+     * 系统流水号
+     */
+    @SerializedName("sys_serial_no")
+    private String sysSerialNo;
+
+    /**
+     * 来账流水号
+     */
+    @SerializedName("deposit_serial_no")
+    private String depositSerialNo;
+
     /**
      * 收款账户账号
      */
@@ -56,20 +74,38 @@ public class ProjectCollectRecordQueryRequest implements PageApiRequest {
     private String payAccountName;
 
     /**
-     * 归集账户账号（拆厂A2）
+     * 归集账户账号
      */
     @SerializedName("collect_account_no")
     private String collectAccountNo;
 
     /**
-     * 归集账户户名（拆厂A2）
+     * 归集账户户名
      */
     @SerializedName("collect_account_name")
     private String collectAccountName;
 
     /**
-     * 备注
+     * 归集金额
+     */
+    @SerializedName("collect_amount")
+    private BigDecimal collectAmount;
+
+    /**
+     * 摘要
      */
     @SerializedName("remark")
     private String remark;
+
+    /**
+     * 归集状态
+     */
+    @SerializedName("collect_status")
+    private String collectStatus;
+
+    /**
+     * 归集结果
+     */
+    @SerializedName("collect_result")
+    private String collectResult;
 }