From 18cee7de6893d9f82168289b34b8133df9f1f7f3 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 21 Mar 2023 09:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationQuery.java            | 11 +++++++++++
 .../FinCollectionConfirmationService.java          | 14 ++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java
index d845b4bcc6..28e0fb0f81 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java
@@ -73,4 +73,15 @@ public class FinCollectionConfirmationQuery implements Query {
     private String payerName;
 
     private String auditState;
+
+    @ApiModelProperty("申请部门")
+    private String createDept; // 申请部门
+    @ApiModelProperty("申请人")
+    private String createByName; // 申请人
+    @ApiModelProperty("申请开始日期")
+    private String createStartDate; // 申请开始日期
+    @ApiModelProperty("申请结束日期")
+    private String createEndDate; // 申请结束日期
+    @ApiModelProperty("收款金额")
+    private String collectionMoney; // 收款金额
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 3825268aaa..974c0803d2 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -194,6 +194,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
                 );
+        String createStartDate = query.getCreateStartDate();
+        String createEndDate = query.getCreateEndDate();
+        qw.apply(StringUtils.isNotEmpty(createStartDate), "date_format (createDate,'%Y-%m-%d') >= date_format('" + createStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(createEndDate), "date_format (createDate,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')"
+                );
         if (StringUtils.isNotBlank(query.getCollectionBank())) {
             qw.eq("collectionBankKey", query.getCollectionBank());
         }
@@ -206,6 +211,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if(StringUtils.isNotBlank(query.getPayerName())){
             qw.like("payerName",query.getPayerName());
         }
+        if(StringUtils.isNotBlank(query.getCreateDept())){
+            qw.like("createDept",query.getCreateDept());
+        }
+        if(StringUtils.isNotBlank(query.getCreateByName())){
+            qw.like("createByName",query.getCreateByName());
+        }
+        if(StringUtils.isNotBlank(query.getCollectionMoney())){
+            qw.eq("collectionMoney",query.getCollectionMoney());
+        }
         //0是申请管理的，1是出纳款项管理
         if (StringUtils.isNotBlank(query.getState())) {
             if ("0".equals(query.getState())) {