xiongchao 3 gadi atpakaļ
vecāks
revīzija
8f6199b62f

+ 46 - 0
platform-dao/src/main/java/com/platform/dao/dto/repair/RepairReasonDTO.java

@@ -67,5 +67,51 @@ public class RepairReasonDTO extends BaseDTO implements Serializable {
      * 关键字
      */
     private String keyword;
+    /**
+     * 更新维修计划
+     */
+    private Boolean changeRepairPlan;
+
+    /**
+     * 更新维修计划
+     */
+    private String changeRepairPlanContent;
+
+    /**
+     * 更新备件计划
+     */
+    private Boolean changeSparePlan;
+
+    /**
+     * 更新备件计划
+     */
+    private String changeSparePlanContent;
+
+    /**
+     * 人员培训
+     */
+    private Boolean userTeach;
 
+    /**
+     * 人员培训
+     */
+    private String userTeachContent;
+    /**
+     * 设备改造升级
+     */
+    private Boolean sbChange;
+
+    /**
+     * 设备改造升级
+     */
+    private String sbChangeContent;
+    /**
+     * 其他
+     */
+    private Boolean otherChange;
+
+    /**
+     * 其他
+     */
+    private String otherChangeContent;
 }

+ 2 - 0
platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -1,5 +1,6 @@
 package com.platform.dao.entity.repair;
 
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.Data;
 
 import javax.persistence.Id;
@@ -227,6 +228,7 @@ public class RepairApplicationForm implements Serializable {
      */
     @Transient
     private String partName;
+
     /**
      * 数据权限
      */

+ 47 - 0
platform-dao/src/main/java/com/platform/dao/entity/repair/RepairReason.java

@@ -56,6 +56,53 @@ public class RepairReason implements Serializable{
      */
     private String improveMeasure;
 
+    /**
+     * 更新维修计划
+     */
+    private Boolean changeRepairPlan;
+
+    /**
+     * 更新维修计划
+     */
+    private String changeRepairPlanContent;
+
+    /**
+     * 更新备件计划
+     */
+    private Boolean changeSparePlan;
+
+    /**
+     * 更新备件计划
+     */
+    private String changeSparePlanContent;
+
+    /**
+     * 人员培训
+     */
+    private Boolean userTeach;
+
+    /**
+     * 人员培训
+     */
+    private String userTeachContent;
+    /**
+     * 设备改造升级
+     */
+    private Boolean sbChange;
+
+    /**
+     * 设备改造升级
+     */
+    private String sbChangeContent;
+    /**
+     * 其他
+     */
+    private Boolean otherChange;
+
+    /**
+     * 其他
+     */
+    private String otherChangeContent;
    /**
     * 数据权限
     */

+ 46 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/repair/RepairReasonVO.java

@@ -56,5 +56,51 @@ public class RepairReasonVO extends BaseVO implements Serializable {
      */
     private String improveMeasure;
 
+    /**
+     * 更新维修计划
+     */
+    private Boolean changeRepairPlan;
+
+    /**
+     * 更新维修计划
+     */
+    private String changeRepairPlanContent;
+
+    /**
+     * 更新备件计划
+     */
+    private Boolean changeSparePlan;
+
+    /**
+     * 更新备件计划
+     */
+    private String changeSparePlanContent;
+
+    /**
+     * 人员培训
+     */
+    private Boolean userTeach;
 
+    /**
+     * 人员培训
+     */
+    private String userTeachContent;
+    /**
+     * 设备改造升级
+     */
+    private Boolean sbChange;
+
+    /**
+     * 设备改造升级
+     */
+    private String sbChangeContent;
+    /**
+     * 其他
+     */
+    private Boolean otherChange;
+
+    /**
+     * 其他
+     */
+    private String otherChangeContent;
 }

+ 22 - 2
platform-dao/src/main/resources/mapper/repair/RepairReasonMapper.xml

@@ -9,7 +9,17 @@
                                      repairReason.problem_desc,
                                      repairReason.check_process,
                                      repairReason.reason_analysis,
-                                     repairReason.improve_measure
+                                     repairReason.improve_measure,
+ repairReason.change_repair_plan,
+ repairReason.change_repair_plan_content,
+ repairReason.change_spare_plan,
+ repairReason.change_spare_plan_content,
+ repairReason.user_teach,
+ repairReason.user_teach_content,
+ repairReason.sb_change,
+ repairReason.sb_change_content,
+ repairReason.other_change,
+ repairReason.other_change_content
                         </sql>
     <sql id="Ref_Column_List">
                                                                          repairReason.no,
@@ -18,7 +28,17 @@
                                      repairReason.problem_desc,
                                      repairReason.check_process,
                                      repairReason.reason_analysis,
-                                     repairReason.improve_measure
+                                     repairReason.improve_measure,
+ repairReason.change_repair_plan,
+ repairReason.change_repair_plan_content,
+ repairReason.change_spare_plan,
+ repairReason.change_spare_plan_content,
+ repairReason.user_teach,
+ repairReason.user_teach_content,
+ repairReason.sb_change,
+ repairReason.sb_change_content,
+ repairReason.other_change,
+ repairReason.other_change_content
                                 </sql>
     <sql id="List_Condition">
                                     <if test="id != null and id != ''">