From 2b9fe5a534d1618a925b9ea45af17bc88430f584 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 2 Aug 2024 15:22:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087980=20=E4=BC=81=E4=B8=9A=E6=9D=A5?=
 =?UTF-8?q?=E6=AC=BE=E8=AF=A6=E6=83=85&=E4=B8=AA=E4=BA=BA=E6=9D=A5?=
 =?UTF-8?q?=E6=AC=BE=E8=AF=A6=E6=83=85--=E5=BB=BA=E8=AE=AE=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E6=98=AF=E5=90=A6=E6=89=93=E5=8C=85=E7=9A=84=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayWorkingGroupMapper.xml      | 38 +++++++------------
 .../entity/CompanyComeMoneyDetailSearch.java  |  3 ++
 .../entity/PrincipalPeopleDetailSearch.java   |  3 ++
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index 916556c3..f67e622b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -1442,6 +1442,9 @@
             <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
                 AND payStatue = #{principalPeopleDetailSearch.inAccountStatue}
             </if>
+            <if test="principalPeopleDetailSearch.pack != null and principalPeopleDetailSearch.pack != ''">
+                AND pack = #{principalPeopleDetailSearch.pack}
+            </if>
             <choose>
                 <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
                     AND allMoney >= #{principalPeopleDetailSearch.allMoney}
@@ -1457,14 +1460,6 @@
                     </if>
                 </otherwise>
             </choose>
-            <!--<choose>
-                <when test="principalPeopleDetailSearch.paymentMonth != null and principalPeopleDetailSearch.paymentMonth != ''">
-                    and confirmDate like concat('%',#{principalPeopleDetailSearch.paymentYear},'-',#{principalPeopleDetailSearch.paymentMonth},'%')
-                </when>
-                <when test="principalPeopleDetailSearch.paymentYear != null and principalPeopleDetailSearch.paymentYear != ''">
-                    and confirmDate like concat('%',#{principalPeopleDetailSearch.paymentYear},'%')
-                </when>
-            </choose>-->
         </where>
         <if test="principalPeopleDetailSearch.column != null and principalPeopleDetailSearch.column != ''">
             <if test="principalPeopleDetailSearch.column == 'allMoney' and principalPeopleDetailSearch.order == 'desc'">
@@ -1542,6 +1537,9 @@
             <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
                 AND payStatue = #{principalPeopleDetailSearch.inAccountStatue}
             </if>
+            <if test="principalPeopleDetailSearch.pack != null and principalPeopleDetailSearch.pack != ''">
+                AND pack = #{principalPeopleDetailSearch.pack}
+            </if>
             <choose>
                 <when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
                     AND allMoney >= #{principalPeopleDetailSearch.allMoney}
@@ -2040,7 +2038,9 @@
             <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
                 AND chargeUse=#{CompanyComeMoneyDetailSearch.chargeUse}
             </if>
-
+            <if test="CompanyComeMoneyDetailSearch.pack != null and CompanyComeMoneyDetailSearch.pack != ''">
+                AND pack =#{CompanyComeMoneyDetailSearch.pack}
+            </if>
             <choose>
                 <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
                     AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney} and allMoney <![CDATA[<]]>=
@@ -2055,14 +2055,6 @@
                     </if>
                 </otherwise>
             </choose>
-            <!--<choose>
-                <when test="CompanyComeMoneyDetailSearch.paymentMonth != null and CompanyComeMoneyDetailSearch.paymentMonth != ''">
-                    and confirmDate like concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'-',#{CompanyComeMoneyDetailSearch.paymentMonth},'%')
-                </when>
-                <when test="CompanyComeMoneyDetailSearch.paymentYear != null and CompanyComeMoneyDetailSearch.paymentYear != ''">
-                    and confirmDate like concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'%')
-                </when>
-            </choose>-->
         </where>
         ) p
         <if test="CompanyComeMoneyDetailSearch.column != null and CompanyComeMoneyDetailSearch.column != ''">
@@ -2154,6 +2146,10 @@
                 AND chargeUse = #{CompanyComeMoneyDetailSearch.chargeUse}
             </if>
 
+            <if test="CompanyComeMoneyDetailSearch.pack != null and CompanyComeMoneyDetailSearch.pack != ''">
+                AND pack =#{CompanyComeMoneyDetailSearch.pack}
+            </if>
+
             <choose>
                 <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
                     AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney}
@@ -2169,14 +2165,6 @@
                     </if>
                 </otherwise>
             </choose>
-            <!--<choose>
-                <when test="CompanyComeMoneyDetailSearch.paymentMonth != null and CompanyComeMoneyDetailSearch.paymentMonth != ''">
-                    and confirmDate like concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'-',#{CompanyComeMoneyDetailSearch.paymentMonth},'%')
-                </when>
-                <when test="CompanyComeMoneyDetailSearch.paymentYear != null and CompanyComeMoneyDetailSearch.paymentYear != ''">
-                    and confirmDate like concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'%')
-                </when>
-            </choose>-->
         </where>
         ) pp
     </select>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java
index 6d6e83be..01f8931b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java
@@ -52,4 +52,7 @@ public class CompanyComeMoneyDetailSearch {
 
     @ApiModelProperty(value = "排序规则")
     private String order;
+
+    @ApiModelProperty(value = "打包")
+    private String pack;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java
index 9b310b31..dac48b9d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java
@@ -53,4 +53,7 @@ public class PrincipalPeopleDetailSearch {
     @ApiModelProperty(value = "排序规则")
     private String order;
 
+    @ApiModelProperty(value = "打包")
+    private String pack;
+
 }