update 全所收入统计增加合同金额

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,

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));