增加报修来源

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

@@ -67,7 +67,7 @@ public class RepairApplicationForm implements Serializable {
      */
     private String no;
     /**
-     * 报修来源:1-点检 2-保养 3-润滑 4-现场
+     * 报修来源:1-内部报修 2-生产报修 3-隐患排查 4-巡检
      */
     private Integer source;
 
@@ -234,7 +234,7 @@ public class RepairApplicationForm implements Serializable {
     private Integer outType;
     private String outNo;
     /**
-     * 类型
+     * 类型  1 内部报修 2 生产报修  3 隐患排查
      */
     private Integer type;
 

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

@@ -0,0 +1,33 @@
+package com.platform.dao.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Description 维修类别枚举
+ * @Author liuyu
+ * @Date 2020/05/05
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
+ */
+@Getter
+@AllArgsConstructor
+public enum RepairApplicationFormSourceEnum {
+    /**
+     * 内部报修
+     */
+    SB(1),
+    /**
+     * 生产
+     */
+    PRODUCER(2),
+    /**
+     * 隐患
+     */
+    HIDDEN_DANGER(3),
+    /**
+     * 巡检
+     */
+    FILL_GATHER(4),
+    ;
+    private final Integer value;
+}

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

@@ -441,4 +441,9 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
      */
     private List<SysFile> reportFileList;
 
+    /**
+     * 设备位号
+     */
+    private String positionNo;
+
 }

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

@@ -8,7 +8,7 @@
         user3.username as checkUserName,
         sb.model as model,
         sb.name as sbName,part.name as partName,
-        sb.no as sbNo, sb.cph as sbCph, sb.model_id as modelId,
+        sb.no as sbNo, sb.cph as sbCph, sb.model_id as modelId,sb.position_no as positionNo,
         error.name as repairErrorTypeName
     </sql>
     <select id="selectPageList" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"

platform-service/src/main/java/com/platform/service/hidden/impl/HiddenDangerServiceImpl.java

@@ -10,6 +10,7 @@ import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.entity.hidden.HiddenDanger;
 import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.enums.HiddenDangerStatusEnum;
+import com.platform.dao.enums.RepairApplicationFormSourceEnum;
 import com.platform.dao.enums.SysFileTypeEnum;
 import com.platform.dao.enums.SysRoleCodeEnum;
 import com.platform.dao.mapper.hidden.HiddenDangerMapper;
@@ -99,6 +100,7 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
         });
         applicationFormDTO.setApplicationFileList(applicationFileList);
         applicationFormDTO.setReportFileList(reportFileList);
+        applicationFormDTO.setSource(RepairApplicationFormSourceEnum.HIDDEN_DANGER.getValue());
         // 调用相关维修类，生成维修单
         RepairBaseStrategy strategy = RepairStrategyFactory.getStrategy(applicationFormDTO.getCategory());
         strategy.callRepair(applicationFormDTO);

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanPlanRepairStrategy.java

@@ -89,6 +89,8 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         form.setReportLeaderId(getReportLeaderId(model.getSbId()));
         // 状态修改为待审核
         form.setStatus(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_ONE.getValue());
+        // 报修来源
+        form.setSource(RepairApplicationFormSourceEnum.SB.getValue());
         repairApplicationFormMapper.insert(form);
         // 记录维修状态跟踪
         String statusRemark = "计划性维修";