From a635c968e3c93e76525c0031c7c74c6fb0021c5b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 16 Aug 2022 14:39:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20=E5=85=A8=E6=89=80=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayWorkingGroupMapper.xml      |  1 +
 .../impl/PayWorkingGroupServiceImpl.java      | 24 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 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 e2c6eb10..e84e5a57 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
@@ -2219,6 +2219,7 @@
     <!--    全所收入统计-->
     <select id="queryListAllProjectMoney" resultType="com.jero.statistics.entity.AllProjectStatistics">
         select
+        sum(allMoney) as allMoney,
         sum(paidNoTaxAmount) as comeAllMoney,
         sum(invoiceNoTaxAmount) as billMoney,
         sum(confirmNoTaxAmount) as confirmAmount,
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index e581f2a9..f68ba215 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -644,21 +644,27 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
         List<AllProjectStatistics> list2=getAllProjectMoneyStatistics(allProjectStatisticsSearch, list);
         AllMoney allMoney=payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch, idList);
 
-        List<String> comeAllMoneyList=list2.stream().map(allProjectStatistics -> allProjectStatistics.getComeAllMoney()).collect(Collectors.toList());
-        List<String> billMoneyList=list2.stream().map(allProjectStatistics -> allProjectStatistics.getBillMoney()).collect(Collectors.toList());
-        List<String> confirmMoneyList=list2.stream().map(allProjectStatistics -> allProjectStatistics.getConfirmAmount()).collect(Collectors.toList());
+        List<String> comeAllMoneyList=list2.stream().map(AllProjectStatistics::getComeAllMoney).collect(Collectors.toList());
+        List<String> billMoneyList=list2.stream().map(AllProjectStatistics::getBillMoney).collect(Collectors.toList());
+        List<String> confirmMoneyList=list2.stream().map(AllProjectStatistics::getConfirmAmount).collect(Collectors.toList());
+        List<String> allMoneyList=list2.stream().map(AllProjectStatistics::getComeAllMoney).collect(Collectors.toList());
         List<List<String>> list3 = new ArrayList<>();
-        list3.add(0,confirmMoneyList);
-        list3.add(1,billMoneyList);
-        list3.add(2,comeAllMoneyList);
+        list3.add(0,allMoneyList);
+        list3.add(1,confirmMoneyList);
+        list3.add(2,billMoneyList);
+        list3.add(3,comeAllMoneyList);
+
 
         AllProjectMoneyExcel comeAllProjectMoney=new AllProjectMoneyExcel("到账金额",allMoney.getComeAllMoney());
         AllProjectMoneyExcel billAllProjectMoney=new AllProjectMoneyExcel("开票金额",allMoney.getBillMoney());
         AllProjectMoneyExcel confirmAllProjectMoney=new AllProjectMoneyExcel("确认收入金额",allMoney.getConfirmAmount());
+        AllProjectMoneyExcel allProjectMoney=new AllProjectMoneyExcel("合同金额",allMoney.getAllMoney());
         List<AllProjectMoneyExcel> excelList = new ArrayList<>();
-        excelList.add(0,confirmAllProjectMoney);
-        excelList.add(1,billAllProjectMoney);
-        excelList.add(2,comeAllProjectMoney);
+        excelList.add(0,allProjectMoney);
+        excelList.add(1,confirmAllProjectMoney);
+        excelList.add(2,billAllProjectMoney);
+        excelList.add(3,comeAllProjectMoney);
+
 
         for (int i=0; i < excelList.size(); i++) {
                 excelList.get(i).setJanuary(list3.get(i).get(0));

From fa595daf7d44440b12a724d2075bb1e96822dada Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 16 Aug 2022 14:56:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=E5=85=A8=E6=89=80=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E7=BB=9F=E8=AE=A1-=E5=90=88=E5=90=8C=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E4=B8=BA0=E6=97=B6=E8=BF=94=E5=9B=9E0.00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/PayWorkingGroupServiceImpl.java     | 2 +-
 .../com/jero/statistics/entity/AllProjectStatistics.java     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index f68ba215..d96d5744 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -693,7 +693,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
         for (int i=1; i <= 12; i++) {
             if (!collect.contains(i)) {
                 StringBuilder stringBuilder=new StringBuilder().append(paymentYear);
-                AllProjectStatistics allProjectStatistics=new AllProjectStatistics("0.00", "0.00", "0.00", stringBuilder.append("-" + i).toString());
+                AllProjectStatistics allProjectStatistics=new AllProjectStatistics("0.00", "0.00", "0.00", "0.00", stringBuilder.append("-" + i).toString());
                 list.add(allProjectStatistics);
             }
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
index 703e3bf8..230443d7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
@@ -7,8 +7,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
-import java.util.Date;
-
 /**
  * @author zql
  * @date 2021/9/17 18:04
@@ -72,7 +70,8 @@ public class AllProjectStatistics {
     @ApiModelProperty(value = "到账时间")
     private String paymentDate;
 
-    public AllProjectStatistics(String confirmAmount, String billMoney, String comeAllMoney, String paymentDate) {
+    public AllProjectStatistics(String allMoney, String confirmAmount, String billMoney, String comeAllMoney, String paymentDate) {
+        this.allMoney=allMoney;
         this.confirmAmount=confirmAmount;
         this.billMoney=billMoney;
         this.comeAllMoney=comeAllMoney;