Merge remote-tracking branch 'origin/master' into 22年七月工作

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml

@@ -2225,6 +2225,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));
@@ -687,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);
             }
         }

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;