add：统计确认月份搜索

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;
 

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;
 

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>

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

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;
 

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;
 

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;
 

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;
 

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;
 

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;