From f28a2ffbc80549625e51583afb97b7df1cfa2b4d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 24 Jul 2023 14:12:55 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=B9=B4?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/project/mapper/xml/PayWorkingGroupMapper.xml | 6 ++++-- .../com/jero/statistics/entity/AllProjectStatistics.java | 5 +++++ 2 files changed, 9 insertions(+), 2 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 c9689828..2ecc1b13 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 @@ -456,7 +456,8 @@ packText, pack, invoiceNoTaxAmount as billMoney, - confirmNoTaxAmount as confirmAmount + confirmNoTaxAmount as confirmAmount, + year from v_statistical v @@ -2435,7 +2436,8 @@ allMoney, paidNoTaxAmount AS comeAllMoney, invoiceNoTaxAmount AS billMoney, - confirmNoTaxAmount AS confirmAmount + confirmNoTaxAmount AS confirmAmount, + year FROM v_statistical v left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id left join pay_mail_bill pmb on pmb.id = pmbp.bill_id 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 c811e4c2..5d577275 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 @@ -68,6 +68,11 @@ public class AllProjectStatistics { @ApiModelProperty(value = "到账时间") private String paymentDate; + @Excel(name = "项目年份", width = 15) + @ApiModelProperty(value = "项目年份") + private String year; + + public AllProjectStatistics(String allMoney, String confirmAmount, String billMoney, String comeAllMoney, String paymentDate) { this.allMoney=allMoney; this.confirmAmount=confirmAmount;