报告导出添加 银行发函 相关字段

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -652,21 +652,25 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 审定金额(不含税)
      */
+    @Excel(name = "审定金额(不含税/元)",width = 20,orderNum = "20")
     private String approvedNoIncludingTax;
 
     /**
      * 审定金额(含税)
      */
+    @Excel(name = "审定金额(含税/元)",width = 20,orderNum = "21")
     private String approvedIncludingTax;
 
     /**
      * 银行函证发出数量
      */
+    @Excel(name = "银行函证发出数量(份)",width = 20,orderNum = "22")
     private String bankLettersCount;
 
     /**
      * 其中采用数字函证发函数量
      */
+    @Excel(name = "其中采用数字函证发函数量(份)",width = 28,orderNum = "23")
     private String digitalLetterCount;
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -106,6 +106,8 @@
                         new_line.report_date,
                         new_line.approved_no_including_tax AS approvedNoIncludingTax,
                         new_line.approved_including_tax AS approvedIncludingTax,
+                        new_line.bank_letters_count AS bankLettersCount,
+                        new_line.digital_letter_count AS digitalLetterCount,
                         cwcb.name AS servedUnitName,
                         a.industry,
                         a.business_objects,