update 全所统计导出增加项目年份

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
         <if test="allProjectStatisticsSearch.paymentYear == null or allProjectStatisticsSearch.paymentYear == ''">
             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

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;