优化

platform-dao/src/main/java/com/platform/dao/vo/export/preparation/ExportPreparationVO.java

@@ -19,33 +19,33 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class ExportPreparationVO implements Serializable {
 
-//    /**
-//     * 主键
-//     */
-//    @Excel(name = "主键", orderNum = "1")
-//    private String id;
+    /**
+     * 主键
+     */
+    @Excel(name = "筹建名称", orderNum = "1")
+    private String name;
 
     /**
      * 申请人id
      */
-    @Excel(name = "申请人", orderNum = "1")
+    @Excel(name = "申请人", orderNum = "2")
     private String userName;
     /**
      * 公司
      */
-    @Excel(name = "公司", orderNum = "2")
+    @Excel(name = "公司", orderNum = "3")
     private String parentPositionName;
 
     /**
      * 申请部门
      */
-    @Excel(name = "申请部门", orderNum = "3")
+    @Excel(name = "申请部门", orderNum = "4")
     private String deptName;
 
     /**
      * 设备型号
      */
-    @Excel(name = "建筑物", orderNum = "4")
+    @Excel(name = "建筑物", orderNum = "5")
     private String positionName;
 
 
@@ -55,27 +55,27 @@ public class ExportPreparationVO implements Serializable {
     /**
      * 报修时间
      */
-    @Excel(name = "申请时间", orderNum = "5")
+    @Excel(name = "申请时间", orderNum = "6")
     private LocalDateTime applyTime;
 
     /**
      * 要求完成日期
      */
-    @Excel(name = "要求完成日期", orderNum = "6")
+    @Excel(name = "要求完成日期", orderNum = "7")
     private LocalDate limitHours;
 
 
     /**
      * 报修状态:0：草稿 1-待分配 2-已分配 3-已完成 4-已撤销
      */
-    @Excel(name = "申请状态", orderNum = "7" ,dicCode = "REPAIR_PREPARATION_STATUS")
+    @Excel(name = "申请状态", orderNum = "8" ,dicCode = "REPAIR_PREPARATION_STATUS")
     private Integer status;
 
 
     /**
      * 费用预算
      */
-    @Excel(name = "费用预算", orderNum = "8")
+    @Excel(name = "费用预算", orderNum = "9")
     private BigDecimal fee;
 
 

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -728,7 +728,6 @@ public class RepairApplicationFormController {
         return new R<>(repairApplicationFormService.staticsNumByStatus());
     }
 
-
     /**
      * 修改记录
      *