From 445fd9b99f65d6aaa18ac01f18fa8309ff683bfa Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 27 Feb 2024 16:01:19 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=A2=9E=E5=8A=A0=E9=A2=84=E4=BC=B0?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=B9=B4=E4=BB=BD=EF=BC=8C=E9=A2=84=E4=BC=B0?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A6=E6=9C=88=E4=BB=BD=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/index/service/IndexService.java  | 11 --------
 .../mapper/xml/PayWorkingGroupMapper.xml      | 26 ++++++++++++++++---
 .../entity/AllProjectStatisticsSearch.java    |  6 +++++
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
index a2ca396f..c614c789 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
@@ -114,17 +114,6 @@ public class IndexService {
         List<String> billMoneyMap = cumulativeProcesZero(list.stream().map(AllProjectStatistics::getBillMoney).collect(Collectors.toList()));
         List<String> confirmAmountMap = cumulativeProcesZero(list.stream().map(AllProjectStatistics::getConfirmAmount).collect(Collectors.toList()));
         List<String> allMoneyMap = cumulativeProcesZero(list.stream().map(AllProjectStatistics::getAllMoney).collect(Collectors.toList()));
-        // 预计到账金额
-        List<AllProjectStatistics> listEstimatedArrivalMoney = payWorkingGroupMapper.cumulativeListEstimatedArrivalMoney(allProjectStatisticsSearch.getPaymentYear());
-        // 累加金额
-        for (int i = 1; i < listEstimatedArrivalMoney.size(); i++) {
-            AllProjectStatistics obj = listEstimatedArrivalMoney.get(i);
-            AllProjectStatistics objLast = listEstimatedArrivalMoney.get(i-1);
-            BigDecimal n = new BigDecimal(obj.getEstimatedArrivalMoney());
-            BigDecimal l = new BigDecimal(objLast.getEstimatedArrivalMoney());
-            obj.setEstimatedArrivalMoney(n.add(l).toPlainString());
-            listEstimatedArrivalMoney.set(i,obj);
-        }
 
         List<String> date = list.stream().map(AllProjectStatistics::getPaymentDate).collect(Collectors.toList());
         List<String> dateList = new ArrayList<>(12);
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 fac39d89..519673ed 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
@@ -522,6 +522,15 @@
             <if test="allProjectStatisticsSearch.estimatedArrivalDateHasFlag != null and allProjectStatisticsSearch.estimatedArrivalDateHasFlag == '0'.toString()">
                 AND estimatedArrivalDate is not null
             </if>
+            <choose>
+                <when test="allProjectStatisticsSearch.estimatedArrivalMonth != null and allProjectStatisticsSearch.estimatedArrivalMonth != ''">
+                    and estimatedArrivalDate like
+                    concat('%',#{allProjectStatisticsSearch.estimatedArrivalYear},'-',#{allProjectStatisticsSearch.estimatedArrivalMonth},'%')
+                </when>
+                <when test="allProjectStatisticsSearch.estimatedArrivalYear != null and allProjectStatisticsSearch.estimatedArrivalYear != ''">
+                    and estimatedArrivalDate like concat('%',#{allProjectStatisticsSearch.estimatedArrivalYear},'%')
+                </when>
+            </choose>
             <choose>
                 <when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
                     AND allMoney >= #{allProjectStatisticsSearch.allMoney}
@@ -648,6 +657,15 @@
             <if test="allProjectStatisticsSearch.estimatedArrivalDateHasFlag != null and allProjectStatisticsSearch.estimatedArrivalDateHasFlag == '0'.toString()">
                 AND estimatedArrivalDate is not null
             </if>
+            <choose>
+                <when test="allProjectStatisticsSearch.estimatedArrivalMonth != null and allProjectStatisticsSearch.estimatedArrivalMonth != ''">
+                    and estimatedArrivalDate like
+                    concat('%',#{allProjectStatisticsSearch.estimatedArrivalYear},'-',#{allProjectStatisticsSearch.estimatedArrivalMonth},'%')
+                </when>
+                <when test="allProjectStatisticsSearch.estimatedArrivalYear != null and allProjectStatisticsSearch.estimatedArrivalYear != ''">
+                    and estimatedArrivalDate like concat('%',#{allProjectStatisticsSearch.estimatedArrivalYear},'%')
+                </when>
+            </choose>
             <choose>
                 <when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
                     AND allMoney >= #{allProjectStatisticsSearch.allMoney}
@@ -2539,13 +2557,13 @@
     <select id="cumulativeListEstimatedArrivalMoney"
             resultType="com.jero.statistics.entity.AllProjectStatistics">
         select DATE_FORMAT(paymentDate, '%Y-%m') as paymentDate,sum(estimatedArrivalMoney) as estimatedArrivalMoney from (
-            select receivable_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate from  pay_common_project where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
+            select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate from  pay_common_project where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
             union all
-            select receivable_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate from  pay_working_group_subitem where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
+            select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate from  pay_working_group_subitem where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
             union all
-            select amount_receivable as estimatedArrivalMoney,estimated_arrival_date as paymentDate from  pay_meeting_situation where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
+            select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate from  pay_meeting_situation where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
             union all
-            select amount_receivable as estimatedArrivalMoney,estimated_arrival_date as paymentDate from  pay_member_project_subitem where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
+            select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate from  pay_member_project_subitem where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
         ) dataAll group by DATE_FORMAT(paymentDate, '%Y-%m') order by paymentDate
     </select>
 </mapper>
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 1f8d5fdb..0982e794 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
@@ -67,4 +67,10 @@ public class AllProjectStatisticsSearch {
     /**预估到账日期是否为空*/
     @ApiModelProperty(value = "预估到账日期是否为空")
     private String estimatedArrivalDateHasFlag;
+    /**预估到账日期是否为空*/
+    @ApiModelProperty(value = "预估到账年份")
+    private String estimatedArrivalYear;
+    /**预估到账日期是否为空*/
+    @ApiModelProperty(value = "预估到账月份")
+    private String estimatedArrivalMonth;
 }