优化

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

@@ -1,8 +1,6 @@
 package com.platform.dao.dto.repair;
 
 import com.platform.common.bean.BaseDTO;
-import com.platform.common.bean.DataScope;
-import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.entity.upms.SysFile;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,9 +8,7 @@ import lombok.experimental.Accessors;
 
 import javax.persistence.Id;
 import javax.persistence.Transient;
-import javax.validation.constraints.*;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -494,4 +490,10 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
 
     private Integer searchYear;
 
+    /**
+     * 报修类型
+     * 1 维修 2 技改 3 项目
+     */
+    private Integer repairFormType;
+
 }

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

@@ -350,4 +350,10 @@ public class RepairApplicationForm implements Serializable {
      * 是否已打印 0 否 1 是
      */
     private Integer printFlag;
+
+    /**
+     * 报修类型
+     * 1 维修 2 技改 3 项目
+     */
+    private Integer repairFormType;
 }

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

@@ -103,6 +103,10 @@ public enum RepairApplicationFormStatusEnum {
      * 计划性维修报修成功
      */
     CALLER_REPAIR_VERIFY_SUCCESS_THREE(22),
+    /**
+     * 报修撤回
+     */
+    CALLER_REPAIR_CANCEL(23),
     ;
     private final Integer value;
 }

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

@@ -475,4 +475,10 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
 
     private int yiBiaoNum;
 
+    /**
+     * 报修类型
+     * 1 维修 2 技改 3 项目
+     */
+    private Integer repairFormType;
+
 }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -675,7 +675,10 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         if(form.getStatus() != RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue() && form.getStatus() != RepairApplicationFormStatusEnum.RECEIVED.getValue()){
             throw new DeniedException("非待接单和已接单状态，不能撤回");
         }
-        mapper.deleteByPrimaryKey(id);
+        RepairApplicationForm upd = new RepairApplicationForm();
+        upd.setId(form.getId());
+        upd.setStatus(RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue());
+        mapper.updateByPrimaryKeySelective(upd);
     }
 
     @Override
@@ -985,11 +988,12 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         SbInfo sbInfo = sbInfoService.getModelById(vo.getSbId());
         if(StringUtils.isNotBlank(sbInfo.getPositionId())){
             vo.setSbPositionName(sbPositionMapper.getById(sbInfo.getPositionId()).getName());
+            vo.setPositionNo(sbInfo.getPositionNo());
         }
         // 父位号
-        if(StringUtils.isNotBlank(sbInfo.getParentId())){
+        /*if(StringUtils.isNotBlank(sbInfo.getParentId())){
             vo.setSelfParentNo(sbInfoService.getModelById(sbInfo.getParentId()).getPositionNo());
-        }
+        }*/
         // 获取装置位置和计划时间
         CustomFieldTemplateData queryData = new CustomFieldTemplateData();
         queryData.setObjId(model.getId());

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

@@ -199,7 +199,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         data.setRepairNo(form.getNo());
         data.setSbLocation(form.getSbCph());
         data.setSbName(sbInfo.getName());
-        data.setSbNo(sbInfo.getNo());
+        data.setSbNo(sbInfo.getPositionNo());
         data.setTrustDept(form.getTrustDept());
         data.setPlanStartTime(DateUtils.dateToString(form.getPlanStartTime(),DateUtils.PATTERN_YMD_HMS));
         data.setPlanEndTime(DateUtils.dateToString(form.getPlanEndTime(),DateUtils.PATTERN_YMD_HMS));