报告导出

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportController.java

@@ -657,6 +657,15 @@ public class CwProjectReportController {
                     }
                     //info.setReviewStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getReviewStatus(), "cw_status", ""));
                 }
+                if(StringUtils.isNotBlank(info.getStatus())){
+                    for (String key : cwStatusDictValueDTOs.keySet()) {
+                        if(info.getStatus().equals(key)){
+                            info.setApplyStatus(String.valueOf(cwStatusDictValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                    //info.setReviewStatus(SpringUtil.getBean ( IDictApi.class ).getDictLabel(info.getReviewStatus(), "cw_status", ""));
+                }
                 if ("1".equals(info.getSignatureType())) {
                     if(StringUtils.isNotBlank(info.getStatus1())){
                         for (String key : cwStatusDictValueDTOs.keySet()) {

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

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