隐患

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

@@ -192,4 +192,15 @@ public class HiddenDangerDTO extends BaseDTO implements Serializable {
      */
     private Integer needStop;
 
+    private String content;
+
+    private String dispatchUserId;
+
+    /**
+     * -1 全部  1 待转任务 2 已转任务
+     */
+    private Integer searchType;
+
+    private List<Integer> statusList;
+
 }

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

@@ -99,6 +99,10 @@ public enum RepairApplicationFormStatusEnum {
      * 大修审核中
      */
     BIG_REPAIR_VERIFYING(21),
+    /**
+     * 计划性维修报修成功
+     */
+    CALLER_REPAIR_VERIFY_SUCCESS_THREE(22),
     ;
     private final Integer value;
 }

platform-dao/src/main/resources/mapper/hidden/HiddenDangerMapper.xml

@@ -120,6 +120,12 @@
         <if test="keyword != null and keyword != ''">
             and hidden.id like concat(concat('%',#{keyword}),'%')
         </if>
+        <if test="statusList != null and statusList.size > 0">
+            AND hidden.status in
+            <foreach item="item" index="index" collection="statusList" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.hidden.HiddenDangerDTO"
             resultType="com.platform.dao.vo.query.hidden.HiddenDangerVO">

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

@@ -8,12 +8,14 @@ import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.hidden.HiddenDangerDTO;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.entity.hidden.HiddenDanger;
+import com.platform.dao.entity.sb.SbInfo;
 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;
+import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.vo.query.hidden.HiddenDangerVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.hidden.HiddenDangerService;
@@ -27,6 +29,7 @@ import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -41,6 +44,8 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
     private SysFileService sysFileService;
     @Resource
     private SbInfoService sbInfoService;
+    @Resource
+    private SbPositionMapper sbPositionMapper;
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -54,6 +59,16 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
     @Override
     public AbstractPageResultBean<HiddenDangerVO> selectPageList(HiddenDangerDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+        if(record.getSearchType() != null){
+            List<Integer> statusList = new ArrayList<>();
+            if(record.getSearchType() == 1) { // 待转任务
+                statusList.add(HiddenDangerStatusEnum.NEW_APPLY.getValue());
+            }else if(record.getSearchType() == 2){
+                statusList.add(HiddenDangerStatusEnum.ON_GOING.getValue());
+                statusList.add(HiddenDangerStatusEnum.FINISHED.getValue());
+            }
+            record.setStatusList(statusList);
+        }
         return new MyPage(mapper.selectList(record));
     }
 
@@ -77,7 +92,7 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
             throw new DeniedException("隐患任务ID不能为空");
         }
         String role = StringUtils.getRoles();
-        if(role.contains(SysRoleCodeEnum.Maintenance_Leader.name())){
+        if(!role.contains(SysRoleCodeEnum.Maintenance_Leader.name())){
             throw new DeniedException("不具备该权限");
         }
         sysFileService.saveFile(model.getId(), SysFileTypeEnum.HIDDEN_DANGER_BEFORE_IMGS.getValue(), model.getBeforeImageList());
@@ -131,7 +146,10 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
         });
         vo.setBeforeImageList(beforeImageList);
         vo.setFileList(fileList);
-        vo.setSbCph(sbInfoService.getById(vo.getSbId()).getCph());
+        SbInfo sbInfo = sbInfoService.getModelById(vo.getSbId());
+        vo.setSbCph(sbInfo.getCph());
+        vo.setSbName(sbInfo.getName());
+        vo.setPositionName(sbPositionMapper.selectNameById(vo.getPositionId()));
         return vo;
     }
 

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

@@ -583,8 +583,9 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         // 修改工单状态
         RepairApplicationForm updForm = new RepairApplicationForm();
         updForm.setId(form.getId());
-        updForm.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
-        updForm.setRepairStartTime(LocalDateTime.now());
+        updForm.setStatus(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFY_SUCCESS_THREE.getValue());
+        //updForm.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
+        //updForm.setRepairStartTime(LocalDateTime.now());
         // 生产审核人
         updForm.setProduceVerifyUserId(SecurityUtils.getUserInfo().getUserId());
         repairApplicationFormMapper.updateByPrimaryKeySelective(updForm);
@@ -593,19 +594,19 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         // 添加审核记录
         addRepairVerifyRecord(model,CommonConstants.STATUS_VERIFY_PASS, CommonConstants.TYPE_CALLER_VERIFY);
         // 添加追踪状态
-        addRepairStatusRecord(form,"维修中");
+        //addRepairStatusRecord(form,"维修中");
         // 添加维修记录
-        model.setRepairUserId(form.getRepairUserId());
-        model.setRepairUserName(form.getRepairUserName());
-        model.setNo(form.getNo());
-        model.setSbId(form.getSbId());
-        model.setSbCph(form.getSbCph());
-        model.setActualUser(form.getActualUser());
-        model.setContent(form.getContent());
-        model.setApplyTime(form.getApplyTime());
-        addRepairRecord(model);
+        //model.setRepairUserId(form.getRepairUserId());
+        //model.setRepairUserName(form.getRepairUserName());
+        //model.setNo(form.getNo());
+        //model.setSbId(form.getSbId());
+        //model.setSbCph(form.getSbCph());
+        //model.setActualUser(form.getActualUser());
+        //model.setContent(form.getContent());
+        //model.setApplyTime(form.getApplyTime());
+        //addRepairRecord(model);
         // 通知维修人可以进行维修
-        sendMessageToRepairer(model);
+        //sendMessageToRepairer(model);
     }
 
     /**