From 417434ae9cc9beea30918d8b2290375d25b28f99 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 28 Dec 2023 17:57:07 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=9D=A5?=
 =?UTF-8?q?=E6=AC=BE=E7=BB=9F=E8=AE=A1=EF=BC=8C=E6=9D=A5=E6=AC=BE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=87=8C=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E7=9A=84=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/project/entity/PayWorkingGroupSubletSearch.java    | 3 +++
 .../project/mapper/xml/PayWorkingGroupSubItemMapper.xml     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
index 40fc47c3..c1e46e68 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
@@ -49,4 +49,7 @@ public class PayWorkingGroupSubletSearch {
 
     @ApiModelProperty(value = "项目负责人id")
     private String principalNameId;
+
+    @ApiModelProperty(value = "是否打包")
+    private String pack;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
index 97856f8e..51e2ac37 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
@@ -189,6 +189,9 @@
                     and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSubletSearch.paymentMonth}, '%')
                 </if>
             </if>-->
+            <if test="payWorkingGroupSubletSearch.pack != null and payWorkingGroupSubletSearch.pack != ''">
+                AND pack = #{payWorkingGroupSubletSearch.pack}
+            </if>
         </where>
         group by id
     </select>
@@ -261,6 +264,9 @@
                     </if>
                 </otherwise>
             </choose>
+            <if test="payWorkingGroupSubletSearch.pack != null and payWorkingGroupSubletSearch.pack != ''">
+                AND pack = #{payWorkingGroupSubletSearch.pack}
+            </if>
             <!--<if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%')
                 <if test="payWorkingGroupSubletSearch.paymentMonth != null and payWorkingGroupSubletSearch.paymentMonth != ''">