退回工单

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

@@ -525,4 +525,6 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
      */
     private List<String> repairIds;
 
+    private String backReason; // 退回原因
+
 }

platform-dao/src/main/java/com/platform/dao/dto/sb/SbInfoDTO.java

@@ -680,4 +680,14 @@ public class SbInfoDTO extends BaseDTO implements Serializable {
     private List<String> typeList;
 
     private Integer typeFlag; // 1 代表按照设备类别分组统计
+
+    /**
+     * 流量
+     */
+    private String liuLiang;
+
+    /**
+     * 扬程
+     */
+    private String yangCheng;
 }

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

@@ -370,4 +370,6 @@ public class RepairApplicationForm implements Serializable {
      * 报修审批人
      */
     private String verifyRepairUserId;
+
+    private String backReason;
 }

platform-dao/src/main/java/com/platform/dao/entity/sb/SbInfo.java

@@ -484,4 +484,14 @@ public class SbInfo implements Serializable {
      * 关联的维修部门ID
      */
     private String repairDeptId;
+
+    /**
+     * 流量
+     */
+    private String liuLiang;
+
+    /**
+     * 扬程
+     */
+    private String yangCheng;
 }

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

@@ -113,6 +113,10 @@ public enum RepairApplicationFormStatusEnum {
      * 验收被拒
      */
     VERIFY_REFUSED(25),
+    /**
+     * 报修回退
+     */
+    FORM_BACK(26),
     ;
     private final Integer value;
 }

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -268,4 +268,10 @@ public class ExportSbInfoVO implements Serializable {
     @Excel(name="排序字段")
     private String sortNum;
 
+    @Excel(name="流量")
+    private String liuLiang;
+
+    @Excel(name="扬程")
+    private String yangCheng;
+
 }

platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -629,4 +629,15 @@ public class SbInfoVO extends BaseVO implements Serializable {
     private String fbbz;
     @Excel(name="防爆合格证号",styleType=1)
     private String fbhgzh;
+    /**
+     * 流量
+     */
+    @Excel(name="流量")
+    private String liuLiang;
+
+    /**
+     * 扬程
+     */
+    @Excel(name="扬程")
+    private String yangCheng;
 }

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -180,7 +180,9 @@ sb.install_unit,
 sb.exam_result,
 sb.use_position,
 sb.sb_register_no,
-sb.check_type
+sb.check_type,
+sb.liu_liang,
+sb.yang_cheng
     </sql>
 
     <sql id="deptSql">

platform-rest/src/main/java/com/platform/rest/controller/operate/ArticleController.java

@@ -11,12 +11,10 @@ import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.operate.ArticleDTO;
 import com.platform.dao.entity.operate.Article;
 import com.platform.dao.enums.ArticleTypeEnum;
-import com.platform.dao.util.UserUtil;
 import com.platform.dao.vo.ArticleVO;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.operate.ArticleService;
 import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -395,6 +395,13 @@ public class RepairApplicationFormController {
         return new R<>();
     }
 
+    @SysLog("回退工单")
+    @PutMapping("/back/repair")
+    public R backRepair(@RequestBody RepairApplicationFormDTO applicationFormDTO) {
+        RepairStrategyFactory.getStrategy(applicationFormDTO.getCategory()).backRepairForm(applicationFormDTO);
+        return new R<>();
+    }
+
     @SysLog("转计划维修")
     @PutMapping("/nonPlan/toPlan/{id}")
     public R toPlan(@PathVariable("id") String id,@RequestBody RepairApplicationFormDTO applicationFormDTO) {

platform-service/src/main/java/com/platform/service/repair/strategy/RepairBaseStrategy.java

@@ -151,4 +151,10 @@ public interface RepairBaseStrategy {
      * @param model
      */
     void handleCallRepair(RepairApplicationFormDTO model);
+
+    /**
+     * 退回报修单
+     * @param model
+     */
+    void backRepairForm(RepairApplicationFormDTO model);
 }

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

@@ -371,6 +371,11 @@ public class AllocateRepairBaseStrategy extends AbstractRepairBaseStrategy {
 
     }
 
+    @Override
+    public void backRepairForm(RepairApplicationFormDTO model) {
+
+    }
+
     @Override
     public RepairApplicationFormDTO handleRepair(RepairApplicationFormDTO dto) {
         //super.handleRepair(dto);

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

@@ -242,6 +242,11 @@ public class BaseRepairBaseStrategy extends AbstractRepairBaseStrategy {
 
     }
 
+    @Override
+    public void backRepairForm(RepairApplicationFormDTO model) {
+
+    }
+
     @Override
     public RepairApplicationFormDTO handleRepair(RepairApplicationFormDTO dto) {
         super.handleRepair(dto);

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

@@ -685,6 +685,11 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         throw new DeniedException("暂不支持审核时，修改工单类别");
     }
 
+    @Override
+    public void backRepairForm(RepairApplicationFormDTO model) {
+
+    }
+
     /**
      * 维修人提交维修完成
      * @param dto

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

@@ -917,6 +917,27 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         }
     }
 
+    @Override
+    public void backRepairForm(RepairApplicationFormDTO model) {
+        // 判断是否具有权限
+        String role = getCurrentRoles();
+        if(!role.contains(SysRoleCodeEnum.REPAIR_MANAGE.name()) && !role.contains(SysRoleCodeEnum.Maintenance_Leader.name())){
+            throw new DeniedException("不具备退回工单的权限");
+        }
+        RepairApplicationForm form = repairApplicationFormMapper.selectById(model.getId());
+        if(form.getStatus() != RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
+            throw new DeniedException("非待接单状态工单，不允许退出");
+        }
+        if(StringUtils.isBlank(model.getBackReason())){
+            throw new DeniedException("退回原因不能为空");
+        }
+        RepairApplicationForm updForm = new RepairApplicationForm();
+        updForm.setId(model.getId());
+        updForm.setBackReason(model.getBackReason());
+        updForm.setStatus(RepairApplicationFormStatusEnum.FORM_BACK.getValue());
+        repairApplicationFormMapper.updateByPrimaryKeySelective(updForm);
+    }
+
     @Override
     public void recoverRepair(RepairApplicationFormDTO model) {
         // 判断是否具有权限