工单导出添加维修负责人和维修人

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

@@ -43,80 +43,91 @@ public class ExportRepairApplicationFormVO implements Serializable {
      */
     @Excel(name = "故障部位", orderNum = "5")
     private String partName;
+    /**
+     *
+     */
+    @Excel(name = "维修负责人", orderNum = "6")
+    private String repairUser;
+
+    /**
+     * 维修人
+     */
+    @Excel(name = "维修人", orderNum = "7")
+    private String repairUserName;
     /**
      * 报修人id
      */
-    @Excel(name = "报修人", orderNum = "6")
+    @Excel(name = "报修人", orderNum = "8")
     private String actualUser;
     /**
      * 报修人id
      */
-    @Excel(name = "响应时间", orderNum = "7")
+    @Excel(name = "响应时间", orderNum = "9")
     private Double receiveMinutes;
     /**
      * 设备名称
      */
-    @Excel(name = "维修时间", orderNum = "8")
+    @Excel(name = "维修时间", orderNum = "10")
     private Double repairMinutes;
     /**
      * 报修人id
      */
-    @Excel(name = "修复时间", orderNum = "9")
+    @Excel(name = "修复时间", orderNum = "11")
     private Double dealMinutes;
     /**
      * 报修状态: 1-待分配 2-已分配 3-已完成 4-已撤销
      */
-    @Excel(name = "报修状态", orderNum = "10", dicCode = "REPAIR_APPLICATION_FORM_STATUS")
+    @Excel(name = "报修状态", orderNum = "12", dicCode = "REPAIR_APPLICATION_FORM_STATUS")
     private Integer status;
 
     /**
      * 报修时间
      */
-    @Excel(name = "报修时间", orderNum = "11")
+    @Excel(name = "报修时间", orderNum = "13")
     private LocalDateTime applyTime;
     /**
      * 维修开始时间
      */
-    @Excel(name = "维修开始时间", orderNum = "12")
+    @Excel(name = "维修开始时间", orderNum = "14")
     private LocalDateTime repairStartTime;
 
     /**
      * 维修结束时间
      */
-    @Excel(name = "维修结束时间", orderNum = "13")
+    @Excel(name = "维修结束时间", orderNum = "15")
     private LocalDateTime repairEndTime;
 
     /**
      * 分析时间
      */
-    @Excel(name = "分析时间", orderNum = "14")
+    @Excel(name = "分析时间", orderNum = "16")
     private LocalDate analyzeTime;
 
     /**
      * 问题描述
      */
-    @Excel(name = "问题描述", orderNum = "15")
+    @Excel(name = "问题描述", orderNum = "17")
     private String problemDesc;
     /**
      * 检查处理过程
      */
-    @Excel(name = "检查处理过程", orderNum = "16")
+    @Excel(name = "检查处理过程", orderNum = "18")
     private String checkProcess;
     /**
      * 原因分析
      */
-    @Excel(name = "原因分析", orderNum = "17")
+    @Excel(name = "原因分析", orderNum = "19")
     private String reasonAnalysis;
     /**
      * 更新维修计划
      */
-    @Excel(name = "改进类别", orderNum = "18")
+    @Excel(name = "改进类别", orderNum = "20")
     private String changeRepairPlan;
 
     /**
      * 更新维修计划
      */
-    @Excel(name = "改进内容", orderNum = "19")
+    @Excel(name = "改进内容", orderNum = "21")
     private String changeRepairPlanContent;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -27,6 +27,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class RepairApplicationFormVO extends BaseVO implements Serializable {
+    /**
+     * 维修负责人
+     */
+    private String repairUser;
     /**
      * 报修人员id
      */

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -6,6 +6,7 @@
         user.real_name as userName,
         user2.real_name as repairUserName,
         user3.real_name as checkUserName,
+        user4.real_name as repairUser,
         sb.name as sbName,part.name as partName,
         sb.no as sbNo, sb.cph as sbCph, sb.model_id as modelId,
         error.name as repairErrorTypeName
@@ -19,6 +20,7 @@
         left join t_sys_user user2 on application.repair_user_id = user2.user_id
         left join t_sys_user user3 on application.check_user_id = user3.user_id
         left join t_sb_info sb on application.sb_id = sb.id
+        left join t_sys_user user4 on sb.repair_user = user4.user_id
         left join t_error_type error on application.repair_error_type_id = error.id
         left join t_part_info part on application.part_id = part.id
         <where>