From 32f33837d038a9a16a5dd0f6dfb2e6bde725ff07 Mon Sep 17 00:00:00 2001
From: zhangqinlin <>
Date: Fri, 8 Jul 2022 17:37:01 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E7=BB=9F=E8=AE=A1=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayWorkingGroupMapper.xml      | 12 +++++----
 .../statistics/entity/DepartStatistics.java   | 26 ++++++++++---------
 .../entity/DepartStatisticsSearch.java        |  7 +++--
 3 files changed, 26 insertions(+), 19 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 98f4c87d..022cc002 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
@@ -2116,7 +2116,7 @@
         comeAllMoney,
         departName,
         billMoney,
-        CONCAT(CAST(ROUND((comeAllMoney / allMoney) * 100, 2) AS CHAR), '%') AS finishRate,
+        CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate,
         confirmAmount
         from
         (select
@@ -2128,6 +2128,7 @@
         from v_statistical v
         left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id
         left join pay_mail_bill pmb on pmbp.bill_id = pmb.id
+        left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id)
         <where>
             <foreach item="item" open="departId in(" separator="," close=")" collection="idList">
                 #{item}
@@ -2136,8 +2137,8 @@
                 AND year LIKE
                 concat(#{departStatisticsSearch.year}, '%')
             </if>
-            <if test="departStatisticsSearch.billYear != null and departStatisticsSearch.billYear != ''">
-                and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{departStatisticsSearch.billYear}, '%')
+            <if test="departStatisticsSearch.paymentYear != null and departStatisticsSearch.paymentYear != ''">
+                and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{departStatisticsSearch.paymentYear}, '%')
             </if>
         </where>
         group by v.departId) p
@@ -2177,6 +2178,7 @@
         from v_statistical v
         left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id
         left join pay_mail_bill pmb on pmbp.bill_id = pmb.id
+        left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id)
         <where>
             <foreach item="item" open="departId in(" separator="," close=")" collection="idList">
                 #{item}
@@ -2185,8 +2187,8 @@
                 AND year LIKE
                 concat(#{departStatisticsSearch.year}, '%')
             </if>
-            <if test="departStatisticsSearch.billYear != null and departStatisticsSearch.billYear != ''">
-                and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{departStatisticsSearch.billYear}, '%')
+            <if test="departStatisticsSearch.paymentYear != null and departStatisticsSearch.paymentYear != ''">
+                and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{departStatisticsSearch.paymentYear}, '%')
             </if>
         </where>
     </select>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java
index 45a9865e..d543bff1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java
@@ -14,23 +14,25 @@ public class DepartStatistics {
     @ApiModelProperty(value = "部门名称")
     private String departName;
 
-    @Excel(name = "应收总金额", width = 15)
-    @ApiModelProperty(value = "应收总金额")
+    @Excel(name = "合同总金额", width = 15)
+    @ApiModelProperty(value = "合同金额")
     private String allMoney;
 
-    @Excel(name = "实收总金额", width = 15)
-    @ApiModelProperty(value = "实收总金额")
-    private String comeAllMoney;
-
-    @Excel(name = "到账率", width = 15)
-    @ApiModelProperty(value = "到账率")
-    private String finishRate;
+    @Excel(name = "确认收入金额", width = 15)
+    @ApiModelProperty(value = "确认收入金额")
+    private String confirmAmount;
 
     @Excel(name = "开票金额", width = 15)
     @ApiModelProperty(value = "开票金额")
     private String billMoney;
 
-    @Excel(name = "确认到账金额", width = 15)
-    @ApiModelProperty(value = "确认到账金额")
-    private String confirmAmount;
+    @Excel(name = "到账总金额", width = 15)
+    @ApiModelProperty(value = "到账总金额")
+    private String comeAllMoney;
+
+    @Excel(name = "确收率", width = 15)
+    @ApiModelProperty(value = "确收率")
+    private String finishRate;
+
+
 }
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 49cccab3..30197c09 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
@@ -10,8 +10,11 @@ public class DepartStatisticsSearch {
     @ApiModelProperty(value = "来款年份")
     private String year;
 
-    @ApiModelProperty(value = "开票年份")
-    private String billYear;
+    /**
+     * 2022.7.7 billYear->paymentYear
+     */
+    @ApiModelProperty(value = "确认年份")
+    private String paymentYear;
 
     @ApiModelProperty(value = "字段")
     private String column;