优化

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

@@ -19,136 +19,65 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class ExportPreparationVO implements Serializable {
 
-    /**
-     * 主键
-     */
-    @Excel(name = "主键", orderNum = "1")
-    private String id;
-
-    /**
-     * 设备型号
-     */
-    @Excel(name = "设备型号", orderNum = "2")
-    private String positionId;
+//    /**
+//     * 主键
+//     */
+//    @Excel(name = "主键", orderNum = "1")
+//    private String id;
 
     /**
      * 申请人id
      */
-    @Excel(name = "申请人", orderNum = "3")
+    @Excel(name = "申请人", orderNum = "1")
     private String userName;
-
-    /**
-     * 申请部门
-     */
-    @Excel(name = "申请部门", orderNum = "4")
-    private String deptName;
-
-    /**
-     * 报修时间
-     */
-    @Excel(name = "报修时间", orderNum = "5")
-    private LocalDateTime applyTime;
-
-    /**
-     * 问题描述
-     */
-    @Excel(name = "问题描述", orderNum = "6")
-    private String content;
-
-    /**
-     * 报修状态:0：草稿 1-待分配 2-已分配 3-已完成 4-已撤销
-     */
-    @Excel(name = "报修状态", orderNum = "7" ,dicCode = "REPAIR_PREPARATION_STATUS")
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注", orderNum = "8")
-    private String remark;
     /**
-     * 创建日期
+     * 公司
      */
-    @Excel(name = "创建日期", orderNum = "9")
-    private LocalDateTime createdTime;
+    @Excel(name = "公司", orderNum = "2")
+    private String parentPositionName;
 
     /**
-     * 更新日期
+     * 申请部门
      */
-    @Excel(name = "更新日期", orderNum = "10")
-    private LocalDateTime updateTime;
+    @Excel(name = "申请部门", orderNum = "3")
+    private String deptName;
 
     /**
-     * 创建人
+     * 设备型号
      */
-    @Excel(name = "创建人", orderNum = "11")
-    private String createdUserId;
+    @Excel(name = "建筑物", orderNum = "4")
+    private String positionName;
 
-    /**
-     * 创建人名称
-     */
-    @Excel(name = "创建人名称", orderNum = "12")
-    private String createdUserName;
 
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人", orderNum = "13")
-    private String updateUserId;
 
-    /**
-     * 更新人名称
-     */
-    @Excel(name = "更新人名称", orderNum = "14")
-    private String updateUserName;
 
-    /**
-     * 维修开始时间
-     */
-    @Excel(name = "维修开始时间", orderNum = "15")
-    private LocalDateTime repairStartTime;
 
     /**
-     * 维修结束时间
+     * 报修时间
      */
-    @Excel(name = "维修结束时间", orderNum = "16")
-    private LocalDateTime repairEndTime;
+    @Excel(name = "申请时间", orderNum = "5")
+    private LocalDateTime applyTime;
 
     /**
-     * 维修耗时
+     * 要求完成日期
      */
-    @Excel(name = "维修耗时", orderNum = "17")
-    private Double repairMinutes;
+    @Excel(name = "要求完成日期", orderNum = "6")
+    private LocalDate limitHours;
 
-    /**
-     * 维修人员id
-     */
-    @Excel(name = "维修人员id", orderNum = "18")
-    private String repairUserId;
 
     /**
-     * 维修描述
+     * 报修状态:0：草稿 1-待分配 2-已分配 3-已完成 4-已撤销
      */
-    @Excel(name = "维修描述", orderNum = "19")
-    private String repairContent;
+    @Excel(name = "申请状态", orderNum = "7" ,dicCode = "REPAIR_PREPARATION_STATUS")
+    private Integer status;
 
-    /**
-     * 要求完成日期
-     */
-    @Excel(name = "要求完成日期", orderNum = "20")
-    private LocalDate limitHours;
 
     /**
      * 费用预算
      */
-    @Excel(name = "费用预算", orderNum = "21")
+    @Excel(name = "费用预算", orderNum = "8")
     private BigDecimal fee;
 
-    /**
-     * 预算明细表
-     */
-    @Excel(name = "预算明细表", orderNum = "22")
-    private String feeFile;
 
 
 }

platform-dao/src/main/java/com/platform/dao/vo/query/preparation/PreparationVO.java

@@ -22,6 +22,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class PreparationVO extends BaseVO implements Serializable {
+    private String parentPositionName;
     private BigDecimal counts;
 
     /**

platform-dao/src/main/resources/mapper/preparation/PreparationMapper.xml

@@ -163,9 +163,10 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.preparation.PreparationDTO"
             resultType="com.platform.dao.vo.query.preparation.PreparationVO">
-        select preparation.*,applyU.real_name as userName,sp.name as positionName,dept.name as deptName
+        select preparation.*,applyU.real_name as userName,sp.name as positionName,dept.name as deptName,psp.name as parentPositionName
         from t_preparation as preparation join t_sys_user applyU on preparation.user_id = applyU.user_id
         join t_sb_position sp on preparation.position_id = sp.id
+        join t_sb_position psp on psp.id = sp.parent_id
         join t_sys_dept dept on preparation.depart_id = dept.dept_id
         <where>
             <include refid="List_Condition"/>