完善

platform-dao/src/main/java/com/platform/dao/vo/export/repair/ExportRepairApplicationFormVO.java

@@ -15,98 +15,61 @@ import java.time.LocalDateTime;
 @Data
 @Accessors(chain = true)
 public class ExportRepairApplicationFormVO implements Serializable {
-
     /**
-   * 主键
-   */
-  @Excel(name = "主键", orderNum = "1")
-  private String id;
-
+     * 报修单号
+     */
+    @Excel(name = "报修单号", orderNum = "1")
+    private String no;
     /**
-   * 设备id
-   */
-  @Excel(name = "设备id", orderNum = "2")
-  private String sbId;
+     * 设备编号
+     */
+    @Excel(name = "设备编号", orderNum = "2")
+    private String sbNo;
 
     /**
-   * 设备id
+   * 设备名称
    */
-  @Excel(name = "设备id", orderNum = "3")
-  private String partId;
-
+  @Excel(name = "设备名称", orderNum = "3")
+  private String sbName;
     /**
+     * 设备名称
+     */
+    @Excel(name = "故障部位", orderNum = "4")
+    private String partName;
+  /**
    * 报修人id
    */
-  @Excel(name = "报修人id", orderNum = "4")
-  private String repairUserId;
-
-    /**
-   * 报修单号
-   */
-  @Excel(name = "报修单号", orderNum = "5")
-  private String no;
-
-    /**
-   * 报修来源:1-点检 2-保养 3-润滑 4-现场
-   */
-  @Excel(name = "报修来源:1-点检 2-保养 3-润滑 4-现场", orderNum = "6")
-  private Integer source;
-
-    /**
-   * 报修时间
-   */
-  @Excel(name = "报修时间", orderNum = "7")
-  private LocalDateTime applyTime;
-
-    /**
-   * 紧急等级: 1-一级 2-二级 3-三级
-
-   */
-  @Excel(name = "紧急等级: 1-一级 2-二级 3-三级", orderNum = "8")
-  private Integer level;
+  @Excel(name = "报修人", orderNum = "5")
+  private String actualUser;
 
     /**
    * 问题描述
    */
-  @Excel(name = "问题描述", orderNum = "9")
+  @Excel(name = "问题描述", orderNum = "6")
   private String content;
 
-    /**
+  /**
    * 报修状态: 1-待分配 2-已分配 3-已完成 4-已撤销
-
    */
-  @Excel(name = "报修状态: 1-待分配 2-已分配 3-已完成 4-已撤销 ", orderNum = "10")
+  @Excel(name = "报修状态", orderNum = "7", dicCode="REPAIR_APPLICATION_FORM_STATUS" )
   private Integer status;
 
     /**
-   * 备注
-   */
-  @Excel(name = "备注", orderNum = "11")
-  private String remark;
-
-    /**
-   * 创建日期
-   */
-  @Excel(name = "创建日期", orderNum = "12")
-  private LocalDateTime createdTime;
-
-    /**
-   * 更新日期
-   */
-  @Excel(name = "更新日期", orderNum = "13")
-  private LocalDateTime updateTime;
-
+     * 报修时间
+     */
+    @Excel(name = "报修时间", orderNum = "8")
+    private LocalDateTime applyTime;
     /**
-   * 创建人
+   * 维修开始时间
    */
-  @Excel(name = "创建人", orderNum = "14")
-  private String createdUserId;
+  @Excel(name = "维修开始时间", orderNum = "9")
+  private LocalDateTime repairStartTime;
 
     /**
-   * 更新人
+   * 维修结束时间
    */
-  @Excel(name = "更新人", orderNum = "15")
-  private String updateUserId;
+  @Excel(name = "维修结束时间", orderNum = "10")
+  private LocalDateTime repairEndTime;
 
 
 }

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

@@ -247,11 +247,11 @@ public class RepairApplicationFormController {
      * @return R
      */
     @GetMapping("/export")
-    @SysLog("保修单导出")
+    @SysLog("报修单导出")
     @PreAuthorize("@pms.hasPermission('repair-application-forms-export')")
     public void export(HttpServletResponse response, RepairApplicationFormDTO repairApplicationFormDTO) {
         List<RepairApplicationForm> list = repairApplicationFormService.getModelListByDTO(repairApplicationFormDTO);
-        ExcelUtil.exportResponseDict(response, ExportRepairApplicationFormVO.class, BeanConverterUtil.copyListProperties(list, ExportRepairApplicationFormVO.class), "保修单");
+        ExcelUtil.exportResponseDict(response, ExportRepairApplicationFormVO.class, BeanConverterUtil.copyListProperties(list, ExportRepairApplicationFormVO.class), "报修单");
     }
 
 }