From a4b02a35660a648a4ac86aee664df57e348a0341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=9D=E5=87=AF=E5=85=B4?= <985571137@qq.com> Date: Fri, 29 Jul 2022 16:50:11 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E6=89=80=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayWorkingGroupServiceImpl.java | 8 +++--- .../entity/AllProjectMoneyExcel.java | 28 +++++++++---------- 2 files changed, 18 insertions(+), 18 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 e44fb033..e581f2a9 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 @@ -648,17 +648,17 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl billMoneyList=list2.stream().map(allProjectStatistics -> allProjectStatistics.getBillMoney()).collect(Collectors.toList()); List confirmMoneyList=list2.stream().map(allProjectStatistics -> allProjectStatistics.getConfirmAmount()).collect(Collectors.toList()); List> 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 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)); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java index 99fafe42..0b4e9500 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectMoneyExcel.java @@ -15,46 +15,46 @@ import org.jeecgframework.poi.excel.annotation.Excel; @AllArgsConstructor public class AllProjectMoneyExcel { - @Excel(name = "类型名称") + @Excel(name = "合同",width=15,height=15) private String category; - @Excel(name="一月") + @Excel(name="1月",width=15,height=15) private String january; - @Excel(name="二月") + @Excel(name="2月",width=15,height=15) private String february; - @Excel(name="三月") + @Excel(name="3月",width=15,height=15) private String march; - @Excel(name="四月") + @Excel(name="4月",width=15,height=15) private String april; - @Excel(name="五月") + @Excel(name="5月",width=15,height=15) private String may; - @Excel(name="六月") + @Excel(name="6月",width=15,height=15) private String june; - @Excel(name="七月") + @Excel(name="7月",width=15,height=15) private String july; - @Excel(name="八月") + @Excel(name="8月",width=15,height=15) private String august; - @Excel(name="九月") + @Excel(name="9月",width=15,height=15) private String september; - @Excel(name="十月") + @Excel(name="10月",width=15,height=15) private String october; - @Excel(name="十一月") + @Excel(name="11月",width=15,height=15) private String november; - @Excel(name="十二月") + @Excel(name="12月",width=15,height=15) private String december ; - @Excel(name="总计") + @Excel(name="总计",width=15,height=15) private String total; public AllProjectMoneyExcel(String category, String total) {