报告导出

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

@@ -26,7 +26,7 @@ public class CwProjectReportData extends BaseDTO {
     @TableField(exist = false)
     private String applyProcDefId;
     @TableField(exist = false)
-    @Excel(name = "报告号申请状态",width = 20,orderNum = "13")
+    @Excel(name = "报告号申请状态",width = 20,orderNum = "16")
     private String applyStatus;
     @TableField(exist = false)
     private String takeNumberType;
@@ -101,12 +101,12 @@ public class CwProjectReportData extends BaseDTO {
 
 
     @TableField(exist = false)
-    @Excel(name = "报告所属部门",width = 20,orderNum = "7")
+    @Excel(name = "报告所属部门",width = 20,orderNum = "10")
     private String departmentName; //部门名称
     /**
      * 项目经理
      */
-    @Excel(name = "项目经理1",width = 12,orderNum = "8")
+    @Excel(name = "项目经理1",width = 12,orderNum = "11")
     private String projectMasterName;
 
     /**
@@ -151,13 +151,13 @@ public class CwProjectReportData extends BaseDTO {
      * 创建人
      */
     @TableField(exist = false)
-    @Excel(name = "创建人",width = 12,orderNum = "10")
+    @Excel(name = "创建人",width = 12,orderNum = "13")
     private String userName; //用户名
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间", exportFormat="yyyy-MM-dd",width = 16,orderNum = "11")
+    @Excel(name = "创建时间", exportFormat="yyyy-MM-dd",width = 16,orderNum = "14")
     private Date createTime;
 
     /**
@@ -207,7 +207,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 公章流程status
      */
-    @Excel(name = "复核签章状态",width = 20,orderNum = "12")
+    @Excel(name = "复核签章状态",width = 20,orderNum = "15")
     private String status1;
 
     /**
@@ -268,7 +268,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 审计收费（元）
      */
-    @Excel(name = "审计收费（元）",width = 12,orderNum = "6")
+    @Excel(name = "审计收费（元）",width = 12,orderNum = "9")
     private String auditFees;
 
     /**
@@ -294,13 +294,13 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 报告名称
      */
-    @Excel(name = "报告名称",width = 40,orderNum = "3")
+    @Excel(name = "报告名称",width = 40,orderNum = "4")
     private String reportName;
     /**
      * 被服务单位名称
      */
     @TableField(exist = false)
-    @Excel(name = "客户名称",width = 40,orderNum = "4")
+    @Excel(name = "客户名称",width = 40,orderNum = "5")
     private String servedUnitName;
 
     /**
@@ -340,7 +340,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 报告文号
      */
-    @Excel(name = "报告文号",width = 12,orderNum = "5")
+    @Excel(name = "报告文号",width = 12,orderNum = "6")
     private String reportNo;
 
     private String[] contractAmounts;
@@ -485,7 +485,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 项目经理2name
      */
-    @Excel(name = "项目经理2",width = 12,orderNum = "9")
+    @Excel(name = "项目经理2",width = 12,orderNum = "12")
     private String projectMaster2Name;
 
     /**
@@ -551,8 +551,13 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 合同名称
      */
+    @Excel(name = "合同名称",width = 40,orderNum = "8")
     private String contractName;
 
+    @TableField(exist = false)
+    @Excel(name = "合同编号",width = 20,orderNum = "7")
+    private String contractNo;
+
     /**
      * 签字注师审核状态
      */

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

@@ -106,6 +106,7 @@
         cw_nra.process_definition_id as applyReviewProcDefId,
         ifnull(cw_nra.review_status,'0') as applyReviewStatus,
         cw_ci.contract_name,
+        cw_ci.contract_no,
         rs.id as revocationId,
         rs.status as rebackStatus,
         rs.proc_ins_id as procInsReId,