From 23ab1129b5f061d4f154d6708afc8be3579b9ea0 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 4 Mar 2022 11:37:00 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=94=E6=94=B6=E9=87=91=E9=A2=9D=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/payment/mapper/xml/PayPaymentRecordMapper.xml   | 9 +++++++++
 .../java/com/jero/project/entity/PayCommonProject.java   | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
index 4eca4427..372c3e92 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
@@ -201,6 +201,15 @@
         LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id
         where
         1=1
+        <if test="param2.startAmount != null and param2.startAmount != '' and param2.endAmount != null and param2.endAmount != ''">
+            AND p.receivable_amount between #{param2.startAmount} and #{param2.endAmount}
+        </if>
+        <if test="param2.startAmount == null and param2.endAmount != null">
+            AND p.receivable_amount <![CDATA[<=]]> #{param2.endAmount}
+        </if>
+        <if test="param2.startAmount != null and param2.endAmount == null">
+            AND p.receivable_amount <![CDATA[>=]]> #{param2.startAmount}
+        </if>
         <if test="projectType != null and projectType != ''">
             AND p.projectType = #{projectType}
         </if>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
index 6f0c6e6c..caad5c33 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
@@ -250,4 +250,10 @@ public class PayCommonProject implements Serializable {
      */
     @TableField(exist = false)
     private String missionAndObjectives;
+
+    @TableField(exist = false)
+    private String startAmount;
+
+    @TableField(exist = false)
+    private String endAmount;
 }