From c370ad993585d457c43c83aa974b3765c77d7869 Mon Sep 17 00:00:00 2001
From: zhangqinlin <>
Date: Tue, 12 Jul 2022 14:56:09 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E7=BB=9F=E8=AE=A1=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=9C=88=E4=BB=BD=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/entity/PayWorkingGroupSearch.java |  3 ++
 .../entity/PayWorkingGroupSubletSearch.java   |  3 ++
 .../mapper/xml/PayWorkingGroupMapper.xml      | 39 +++++++++++++++++++
 .../xml/PayWorkingGroupSubItemMapper.xml      |  6 +++
 .../entity/AllProjectStatisticsSearch.java    |  3 ++
 .../entity/CompanyComeMoneyDetailSearch.java  |  3 ++
 .../entity/CompanyComeMoneySearch.java        |  3 ++
 .../entity/DepartStatisticsSearch.java        |  3 ++
 .../entity/PrincipalPeopleDetailSearch.java   |  3 ++
 .../entity/PrincipalPeopleSearch.java         |  3 ++
 10 files changed, 69 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java
index f2d898e0..8cc5addb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java
@@ -28,6 +28,9 @@ public class PayWorkingGroupSearch {
     @ApiModelProperty(value = "确认年份")
     private String paymentYear;
 
+    @ApiModelProperty(value = "确认月份")
+    private String paymentMonth;
+
     @ApiModelProperty(value = "应收总金额范围")
     private String allMoneyTwo;
 
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 69711955..40fc47c3 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
@@ -38,6 +38,9 @@ public class PayWorkingGroupSubletSearch {
     @ApiModelProperty(value = "确认年份")
     private String paymentYear;
 
+    @ApiModelProperty(value = "确认月份")
+    private String paymentMonth;
+
     @ApiModelProperty(value = "来款用途")
     private String chargeUse;
 
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 022cc002..a38295e2 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
@@ -164,6 +164,9 @@
             </if>
             <if test="payWorkingGroupSearch.paymentYear != null and payWorkingGroupSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSearch.paymentYear}, '%')
+                <if test="payWorkingGroupSearch.paymentMonth != null and payWorkingGroupSearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSearch.paymentMonth}, '%')
+                </if>
             </if>
             <choose>
                 <when test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != '' and payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
@@ -245,6 +248,9 @@
             </if>
             <if test="payWorkingGroupSearch.paymentYear != null and payWorkingGroupSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSearch.paymentYear}, '%')
+                <if test="payWorkingGroupSearch.paymentMonth != null and payWorkingGroupSearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSearch.paymentMonth}, '%')
+                </if>
             </if>
             <choose>
                 <when test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != '' and payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
@@ -427,6 +433,9 @@
             </choose>
             <if test="allProjectStatisticsSearch.paymentYear != null and allProjectStatisticsSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{allProjectStatisticsSearch.paymentYear}, '%')
+                <if test="allProjectStatisticsSearch.paymentMonth != null and allProjectStatisticsSearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{allProjectStatisticsSearch.paymentMonth}, '%')
+                </if>
             </if>
             <if test="allProjectStatisticsSearch.companyContactName != null and allProjectStatisticsSearch.companyContactName != ''">
                 and contactsName like concat('%', #{allProjectStatisticsSearch.companyContactName}, '%')
@@ -1112,6 +1121,9 @@
         </where>
         <if test="principalPeopleSearch.paymentYear != null and principalPeopleSearch.paymentYear != ''">
             and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{principalPeopleSearch.paymentYear}, '%')
+            <if test="principalPeopleSearch.paymentMonth != null and principalPeopleSearch.paymentMonth != ''">
+                and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{principalPeopleSearch.paymentMonth}, '%')
+            </if>
         </if>
         group by principalId ) ppp
         <where>
@@ -1195,6 +1207,9 @@
         </where>
         <if test="principalPeopleSearch.paymentYear != null and principalPeopleSearch.paymentYear != ''">
             and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{principalPeopleSearch.paymentYear}, '%')
+            <if test="principalPeopleSearch.paymentMonth != null and principalPeopleSearch.paymentMonth != ''">
+                and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{principalPeopleSearch.paymentMonth}, '%')
+            </if>
         </if>
         group by principalId ) ppp
         <where>
@@ -1382,6 +1397,9 @@
             </choose>
             <if test="principalPeopleDetailSearch.paymentYear != null and principalPeopleDetailSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{principalPeopleDetailSearch.paymentYear}, '%')
+                <if test="principalPeopleDetailSearch.paymentMonth != null and principalPeopleDetailSearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{principalPeopleDetailSearch.paymentMonth}, '%')
+                </if>
             </if>
         </where>
     </select>
@@ -1439,6 +1457,9 @@
             </choose>
             <if test="principalPeopleDetailSearch.paymentYear != null and principalPeopleDetailSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{principalPeopleDetailSearch.paymentYear}, '%')
+                <if test="principalPeopleDetailSearch.paymentMonth != null and principalPeopleDetailSearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{principalPeopleDetailSearch.paymentMonth}, '%')
+                </if>
             </if>
         </where>
         ) pp
@@ -1747,6 +1768,9 @@
             </if>
             <if test="companyComeMoneySearch.paymentYear != null and companyComeMoneySearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{companyComeMoneySearch.paymentYear}, '%')
+                <if test="companyComeMoneySearch.paymentMonth != null and companyComeMoneySearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{companyComeMoneySearch.paymentMonth}, '%')
+                </if>
             </if>
         </where>
         group by chargeCompanyId
@@ -1829,6 +1853,9 @@
             </if>
             <if test="companyComeMoneySearch.paymentYear != null and companyComeMoneySearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{companyComeMoneySearch.paymentYear}, '%')
+                <if test="companyComeMoneySearch.paymentMonth != null and companyComeMoneySearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{companyComeMoneySearch.paymentMonth}, '%')
+                </if>
             </if>
         </where>
         group by chargeCompanyId
@@ -2014,6 +2041,9 @@
             </choose>
             <if test="CompanyComeMoneyDetailSearch.paymentYear != null and CompanyComeMoneyDetailSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{CompanyComeMoneyDetailSearch.paymentYear}, '%')
+                <if test="CompanyComeMoneyDetailSearch.paymentMonth != null and CompanyComeMoneyDetailSearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{CompanyComeMoneyDetailSearch.paymentMonth}, '%')
+                </if>
             </if>
         </where>
         ) p
@@ -2105,6 +2135,9 @@
             </choose>
             <if test="CompanyComeMoneyDetailSearch.paymentYear != null and CompanyComeMoneyDetailSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{CompanyComeMoneyDetailSearch.paymentYear}, '%')
+                <if test="CompanyComeMoneyDetailSearch.paymentMonth != null and CompanyComeMoneyDetailSearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{CompanyComeMoneyDetailSearch.paymentMonth}, '%')
+                </if>
             </if>
         </where>
         ) pp
@@ -2139,6 +2172,9 @@
             </if>
             <if test="departStatisticsSearch.paymentYear != null and departStatisticsSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{departStatisticsSearch.paymentYear}, '%')
+                <if test="departStatisticsSearch.paymentMonth != null and departStatisticsSearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{departStatisticsSearch.paymentMonth}, '%')
+                </if>
             </if>
         </where>
         group by v.departId) p
@@ -2189,6 +2225,9 @@
             </if>
             <if test="departStatisticsSearch.paymentYear != null and departStatisticsSearch.paymentYear != ''">
                 and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{departStatisticsSearch.paymentYear}, '%')
+                <if test="departStatisticsSearch.paymentMonth != null and departStatisticsSearch.paymentMonth != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{departStatisticsSearch.paymentMonth}, '%')
+                </if>
             </if>
         </where>
     </select>
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 17d4a569..b5c822f2 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
@@ -121,6 +121,9 @@
             </choose>
             <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 != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSubletSearch.paymentMonth}, '%')
+                </if>
             </if>
         </where>
         group by id
@@ -184,6 +187,9 @@
             </choose>
             <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 != ''">
+                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSubletSearch.paymentMonth}, '%')
+                </if>
             </if>
         </where>
         group by id) p
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java
index 1bb0852c..1d1cb9db 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java
@@ -50,6 +50,9 @@ public class AllProjectStatisticsSearch {
     @ApiModelProperty(value = "确认年份")
     private String paymentYear;
 
+    @ApiModelProperty(value = "确认月份")
+    private String paymentMonth;
+
     @ApiModelProperty(value = "字段")
     private String column;
 
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 436561aa..6d6e83be 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
@@ -44,6 +44,9 @@ public class CompanyComeMoneyDetailSearch {
     @ApiModelProperty(value = "确认年份")
     private String paymentYear;
 
+    @ApiModelProperty(value = "确认月份")
+    private String paymentMonth;
+
     @ApiModelProperty(value = "字段")
     private String column;
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java
index 6e9c5797..1341be74 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java
@@ -35,6 +35,9 @@ public class CompanyComeMoneySearch {
     @ApiModelProperty(value = "确认年份")
     private String paymentYear;
 
+    @ApiModelProperty(value = "确认月份")
+    private String paymentMonth;
+
     @ApiModelProperty(value = "字段")
     private String column;
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatisticsSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatisticsSearch.java
index 30197c09..9d2f71ff 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatisticsSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatisticsSearch.java
@@ -16,6 +16,9 @@ public class DepartStatisticsSearch {
     @ApiModelProperty(value = "确认年份")
     private String paymentYear;
 
+    @ApiModelProperty(value = "确认月份")
+    private String paymentMonth;
+
     @ApiModelProperty(value = "字段")
     private String column;
 
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 13c67a6d..9b310b31 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
@@ -44,6 +44,9 @@ public class PrincipalPeopleDetailSearch {
     @ApiModelProperty(value = "确认年份")
     private String paymentYear;
 
+    @ApiModelProperty(value = "确认月份")
+    private String paymentMonth;
+
     @ApiModelProperty(value = "字段")
     private String column;
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java
index 4a5dd9ef..83b6ef61 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleSearch.java
@@ -32,6 +32,9 @@ public class PrincipalPeopleSearch {
     @ApiModelProperty(value = "确认年份")
     private String paymentYear;
 
+    @ApiModelProperty(value = "确认月份")
+    private String paymentMonth;
+
     @ApiModelProperty(value = "字段")
     private String column;