完善

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

@@ -23,8 +23,9 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class RepairReasonDTO extends BaseDTO implements Serializable {
+    private Integer type;
     /**
-     * 状态:1新建，2已完成
+     * 状态:1新建，2已完成：0已废弃
      */
     private Integer status;
     List<SysFile> fileList;

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

@@ -63,6 +63,17 @@ public class RepairReason implements Serializable{
      */
     private String improveMeasure;
 
+    /**
+     * 改进类别:
+     * 1更新保养计划
+     * 2更新备件计划
+     * 3人员培训
+     * 4设备改造升级
+     * 5其他
+     *
+     */
+    private Integer type;
+
     /**
      * 更新维修计划
      */

platform-dao/src/main/java/com/platform/dao/enums/RepairReasonTypeEnum.java

@@ -0,0 +1,38 @@
+package com.platform.dao.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Description 改进措施类型
+ * @Author chenyuehu
+ * @Date 2020/2/17
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Getter
+@AllArgsConstructor
+public enum RepairReasonTypeEnum {
+
+    /**
+     * 1更新保养计划
+     */
+    CHANGE_CHECK_STANDARD(1),
+    /**
+     * 2更新备件计划
+     */
+    CHANGE_SPARE_BOM(2),
+    /**
+     * 	3人员培训
+     */
+    PERSON_PEIXUN(3),
+    /**
+     * 4设备改造升级
+     */
+    SB_CHANGE(4),
+    /**
+     * 5其他
+     */
+    OTHER(5);
+    private Integer value;
+
+}

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

@@ -22,6 +22,7 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class RepairReasonVO extends BaseVO implements Serializable {
+    private Integer type;
     /**
      * 状态:1新建，2已完成
      */

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

@@ -4,6 +4,7 @@
     <sql id="Base_Column_List">
                              repairReason.id,
                                      repairReason.no,
+ repairReason.type, repairReason.status,
  repairReason.sb_id,
                                      repairReason.repair_id,
                                      repairReason.analyze_time,
@@ -25,6 +26,7 @@
     <sql id="Ref_Column_List">
                                                                          repairReason.no,
                                      repairReason.sb_id,
+repairReason.type, repairReason.status,
                                      repairReason.repair_id,
                                      repairReason.analyze_time,
                                      repairReason.problem_desc,
@@ -52,6 +54,12 @@
                 <if test="sbId != null and sbId != ''">
                     and repairReason.sb_id = #{sbId}
                 </if>
+                <if test="status != null and status != ''">
+                    and repairReason.status = #{status}
+                </if>
+                <if test="type != null and type != ''">
+                    and repairReason.type = #{type}
+                </if>
                 <if test="repairId != null and repairId != ''">
                     and repairReason.repair_id = #{repairId}
                 </if>