导出功能修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportController.java

@@ -306,15 +306,28 @@ public class CwProjectReportController {
         }
         if(result.size()>0){
             for (CwProjectReportData info : result) {
-                if(StringUtils.isNotBlank(info.getStatus())){
-                    info.setStatus(DictUtils.getDictLabel(info.getStatus(), "cw_status", ""));
+//                if(StringUtils.isNotBlank(info.getStatus())){
+//                    info.setStatus(DictUtils.getDictLabel(info.getStatus(), "cw_status", ""));
+//                }
+                if(StringUtils.isNotBlank(info.getReviewStatus())){
+                    info.setReviewStatus(DictUtils.getDictLabel(info.getReviewStatus(), "cw_status", ""));
                 }
-                if(StringUtils.isNotBlank(info.getStatus1())){
-                    info.setStatus1(DictUtils.getDictLabel(info.getStatus1(), "cw_status", ""));
+                if ("1".equals(info.getSignatureType())) {
+                    if(StringUtils.isNotBlank(info.getStatus1())){
+                        info.setStatus1(DictUtils.getDictLabel(info.getStatus1(), "cw_status", ""));
+                    }
                 }
-                if(StringUtils.isNotBlank(info.getStatus2())){
-                    info.setStatus1(DictUtils.getDictLabel(info.getStatus2(), "cw_project_report_sign_status", ""));
+                if ("2".equals(info.getSignatureType())) {
+                    if(StringUtils.isNotBlank(info.getStatus2())){
+                        info.setStatus1(DictUtils.getDictLabel(info.getStatus2(), "cw_project_report_sign_status", ""));
+                    }
                 }
+                if ("3".equals(info.getSignatureType())) {
+                    if(StringUtils.isNotBlank(info.getStatus3())){
+                        info.setStatus1(DictUtils.getDictLabel(info.getStatus3(), "cw_project_report_sign_status", ""));
+                    }
+                }
+
             }
         }
         EasyPoiUtil.exportExcel ( result, "报告信息",  options.getSheetName ( ), CwProjectReportData.class, fileName, response );

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReportData.java

@@ -38,19 +38,19 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 单据编号
      */
-    @Excel(name = "单据编号",width = 20)
+    @Excel(name = "单据编号",width = 20,orderNum = "1")
     private String documentNo;
     /**
      * 项目名称
      */
     @Query(tableColumn = "b.project_name")
-    @Excel(name = "项目名称",width = 40)
+    @Excel(name = "项目名称",width = 40,orderNum = "3")
     private String projectName;
     /**
      * 项目编号
      */
     @Query(tableColumn = "b.project_number")
-    @Excel(name = "项目编号",width = 20)
+    @Excel(name = "项目编号",width = 20,orderNum = "2")
     private String projectNumber;
     /**
      * 项目id
@@ -63,13 +63,13 @@ public class CwProjectReportData extends BaseDTO {
 
 
     @TableField(exist = false)
-    @Excel(name = "报告所属部门",width = 20)
+    @Excel(name = "报告所属部门",width = 20,orderNum = "5")
     private String departmentName; //部门名称
     /**
      * 项目经理
      */
     @Query(tableColumn = "e.name")
-    @Excel(name = "项目经理",width = 12)
+    @Excel(name = "项目经理",width = 12,orderNum = "6")
     private String projectMasterName;
 
     /**
@@ -101,19 +101,18 @@ public class CwProjectReportData extends BaseDTO {
      * 创建人
      */
     @TableField(exist = false)
-    @Excel(name = "创建人",width = 12)
+    @Excel(name = "创建人",width = 12,orderNum = "7")
     private String userName; //用户名
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间", exportFormat="yyyy-MM-dd",width = 16)
+    @Excel(name = "创建时间", exportFormat="yyyy-MM-dd",width = 16,orderNum = "8")
     private Date createDate;
 
     /**
      * 状态
      */
-    @Excel(name = "状态",width = 12)
     private String status;
 
     //新建行数据
@@ -155,7 +154,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 公章流程status
      */
-    @Excel(name = "签章状态",width = 12)
+    @Excel(name = "签章状态",width = 12,orderNum = "10")
     private String status1;
 
     /**
@@ -276,6 +275,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 报告文号
      */
+    @Excel(name = "报告文号",width = 12,orderNum = "4")
     private String reportNo;
 
     private String[] contractAmounts;
@@ -288,6 +288,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 报告复核流程状态
      */
+    @Excel(name = "复核状态",width = 12,orderNum = "9")
     private String reviewStatus;
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/dto/CwProjectReportArchiveDTO.java

@@ -85,6 +85,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 状态
      */
+    @Excel(name = "状态",width = 25,orderNum = "16")
     private String status;
 
     /**
@@ -145,13 +146,13 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 创建人姓名
      */
-    @Excel(name = "创建人",width = 25,orderNum = "13")
+    @Excel(name = "创建人",width = 25,orderNum = "14")
     private String createName;
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "14")
+    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "15")
     private String createDateT;
 
     /**
@@ -204,6 +205,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 罚款金额
      */
+    @Excel(name = "罚款金额",width = 25,orderNum = "13")
     private String fineMoney;
 
     /**