update 会所收入导出功能

2022-07-29 16:50:11 +08:00
parent cd84637553
commit a4b02a3566
2 changed files with 18 additions and 18 deletions
@@ -648,17 +648,17 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
        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<List<String>> list3 = new ArrayList<>();
-        list3.add(0,comeAllMoneyList);
+        list3.add(0,confirmMoneyList);
        list3.add(1,billMoneyList);
-        list3.add(2,confirmMoneyList);
+        list3.add(2,comeAllMoneyList);

        AllProjectMoneyExcel comeAllProjectMoney=new AllProjectMoneyExcel("到账金额",allMoney.getComeAllMoney());
        AllProjectMoneyExcel billAllProjectMoney=new AllProjectMoneyExcel("开票金额",allMoney.getBillMoney());
        AllProjectMoneyExcel confirmAllProjectMoney=new AllProjectMoneyExcel("确认收入金额",allMoney.getConfirmAmount());
        List<AllProjectMoneyExcel> excelList = new ArrayList<>();
-        excelList.add(0,comeAllProjectMoney);
+        excelList.add(0,confirmAllProjectMoney);
        excelList.add(1,billAllProjectMoney);
-        excelList.add(2,confirmAllProjectMoney);
+        excelList.add(2,comeAllProjectMoney);

        for (int i=0; i < excelList.size(); i++) {
                excelList.get(i).setJanuary(list3.get(i).get(0));