隐患初始化

platform-dao/src/main/java/com/platform/dao/dto/hidden/HiddenDangerDTO.java

@@ -148,4 +148,26 @@ public class HiddenDangerDTO extends BaseDTO implements Serializable {
      */
     private List<SysFile> fileList;
 
+    /**
+     * 设备停机修复时间：报修类型：1：计划性维修，2非计划性维修，3其他  4 日常维修
+     */
+    private Integer category;
+
+    private String repairProfessor; // 维修专业
+
+    private String repairType; // 特殊作业类型
+
+    /**
+     * 计划性维修等级  大 中 小
+     */
+    private String repairPlanLevel;
+
+    /**
+     * 计划开始时间
+     */
+    private LocalDateTime planStartTime;
+    /**
+     * 计划结束时间
+     */
+    private LocalDateTime planEndTime;
 }

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

@@ -0,0 +1,74 @@
+package com.platform.dao.enums;
+
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 设备状态
+ * @Author liuyu
+ * @Date 2020/05/05
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
+ */
+@Getter
+@AllArgsConstructor
+public enum TrustDeptEnum {
+
+    /**
+     * 生产部
+     */
+    PRODUCE(1, "生产部"),
+    /**
+     * 研发部
+     */
+    DEVELOP(2, "研发部"),
+    /**
+     * 安环部
+     */
+    SAFE(3, "安环部"),
+    /**
+     * 质量部
+     */
+    QUALITY(4, "质量部"),
+    /**
+     * 能源装备部
+     */
+    SB(5, "能源装备部"),
+    /**
+     * 其他
+     */
+    OTHER(6, "其他"),;
+
+    private final Integer value;
+    private final String name;
+
+    //讲枚举转换成list格式，这样前台遍历的时候比较容易，列如 下拉框 后台调用toList方法，你就可以得到code 和name了
+    public static List<Map<String, Object>> toList() {
+        List<Map<String, Object>> list = Lists.newArrayList();//Lists.newArrayList()其实和new ArrayList()几乎一模
+        //  一样, 唯一它帮你做的(其实是javac帮你做的), 就是自动推导(不是"倒")尖括号里的数据类型.
+        for (TrustDeptEnum obj : TrustDeptEnum.values()) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("value", obj.getValue());
+            map.put("name", obj.getName());
+            list.add(map);
+        }
+        return list;
+    }
+
+    //讲枚举转换成list格式，这样前台遍历的时候比较容易，列如 下拉框 后台调用toList方法，你就可以得到code 和name了
+    public static String getNameByValue(Integer value) {
+        String name = "";
+        for (TrustDeptEnum obj : TrustDeptEnum.values()) {
+            if(obj.getValue() == value){
+                name = obj.getName();
+                break;
+            }
+        }
+        return name;
+    }
+
+}

platform-dao/src/main/java/com/platform/dao/vo/query/store/OutStoreFormVO.java

@@ -120,4 +120,6 @@ public class OutStoreFormVO extends BaseVO implements Serializable {
      * 是否出库：0退库，1出库
      */
     private Integer outFlag;
+
+    private String feeFrom; // 成本归属
 }

platform-service/src/main/java/com/platform/service/hidden/HiddenDangerService.java

@@ -34,4 +34,10 @@ public interface HiddenDangerService extends IBaseService<HiddenDanger, HiddenDa
 
     HiddenDanger saveByDTO(HiddenDangerDTO model);
 
+    /**
+     * 隐患转维修
+     * @param model
+     */
+    void transferToRepair(HiddenDangerDTO model);
+
                                                                                                                                                                                                                                                     }

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

@@ -55,6 +55,18 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
         return saveModelByDTO(model);
     }
 
+    @Override
+    public void transferToRepair(HiddenDangerDTO model) {
+
+        // 复制信息
+
+        // 确定报修人，应该是班组长
+
+        // 调用相关维修类，生成维修单
+
+        // 修改隐患任务状态
+    }
+
     @Override
     public AbstractPageResultBean<HiddenDanger> selectPageInfo(HiddenDangerDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);

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

@@ -76,6 +76,10 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
             if(!role.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
                 throw new DeniedException("您不具有报修报修权限，如需报修，请管理员配置权限！");
             }
+            if(role.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
+                // 生产部
+                model.setTrustDept(TrustDeptEnum.PRODUCE.getValue());
+            }
         }
         String repairDeptId = model.getRepairDeptId();
         if(StringUtils.isBlank(repairDeptId)){

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -12,10 +12,14 @@ import com.platform.dao.bean.MyPage;
 import com.github.pagehelper.PageHelper;
 import com.platform.dao.dto.store.*;
 import com.platform.dao.dto.store.OutStoreDetailDTO;
+import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.sb.SbOil;
 import com.platform.dao.entity.store.*;
 import com.platform.dao.entity.store.OutStoreDetail;
 import com.platform.dao.enums.*;
+import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
+import com.platform.dao.mapper.sb.SbInfoMapper;
+import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.mapper.store.*;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.query.store.*;
@@ -58,6 +62,9 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     private SparePickFormMapper sparePickFormMapper;
     private SparePickDetailMapper sparePickDetailMapper;
     private InStoreFormServiceImpl inStoreFormServiceImpl;
+    private RepairApplicationFormMapper repairApplicationFormMapper;
+    private SbInfoMapper sbInfoMapper;
+    private SbPositionMapper sbPositionMapper;
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -104,6 +111,14 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
             outStoreFormVO.setStoreName(store.getName());
         }*/
         outStoreFormVO.setDetailList(mapper.selectDetailList(id));
+        // 获取成本归属
+        if(StringUtils.isNotBlank(outStoreFormVO.getPickId())){
+            String sbId = repairApplicationFormMapper.selectById(outStoreFormVO.getPickId()).getSbId();
+            SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(sbId);
+            if(StringUtils.isNotBlank(sbInfo.getPositionId())){
+                outStoreFormVO.setFeeFrom(sbPositionMapper.selectNameById(sbInfo.getPositionId()) + "-" + sbInfo.getCph());
+            }
+        }
         return outStoreFormVO;
     }