Merge remote-tracking branch 'origin/demo_' into demo_

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/check/CheckStandard.java

@@ -173,5 +173,5 @@ public class CheckStandard implements Serializable {
      */
     private List<CheckStandardSpareVO> detailList;
 
-    private String positionNo; // 设备位号
+    //private String positionNo; // 设备位号
 }

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-dao/src/main/resources/mapper/check/CheckStandardMapper.xml

@@ -137,7 +137,7 @@ checkstandard.last_date,
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.check.CheckStandardDTO"
             resultType="com.platform.dao.vo.query.check.CheckStandardVO">
-        select checkstandard.*, sbInfo.name as sbName, sbInfo.no as sbNo,
+        select checkstandard.*, sbInfo.name as sbName, sbInfo.no as sbNo, sbInfo.position_no as positionNo,
         sbInfo.level as sbLevel,sbInfo.position_no as positionNo,
         sbInfo.repair_user as repairUser,
         partInfo.name as partName

platform-rest/src/main/java/com/platform/rest/controller/check/CheckStandardController.java

@@ -60,8 +60,8 @@ public class CheckStandardController {
      * @return R
      */
     @GetMapping("/{id}")
-    public R<CheckStandard> getById(@PathVariable("id") String id){
-        return new R<>(checkStandardService.getModelById(id));
+    public R<CheckStandardVO> getById(@PathVariable("id") String id){
+        return new R<>(checkStandardService.getVOById(id));
     }
 
     @PostMapping("/add/{id}")
@@ -201,8 +201,8 @@ public class CheckStandardController {
    * @return R
    */
   @GetMapping("/page")
-  public R<AbstractPageResultBean<CheckStandard>> query(CheckStandardDTO checkStandardDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(checkStandardService.selectPageInfo(checkStandardDTO, pageNum, pageSize));
+  public R<AbstractPageResultBean<CheckStandardVO>> query(CheckStandardDTO checkStandardDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+      return new R<>(checkStandardService.selectPage(checkStandardDTO, pageNum, pageSize));
   }
 
   /**

platform-service/src/main/java/com/platform/service/check/CheckStandardService.java

@@ -72,4 +72,9 @@ public interface CheckStandardService extends IBaseService<CheckStandard, CheckS
      */
     AbstractPageResultBean<CheckStandardSpareVO> selectSpareWarnVOPage(int month, int type, int pageNum, int pageSize);
 
+   AbstractPageResultBean<CheckStandardVO> selectPage(CheckStandardDTO record, int pageNum, int pageSize);
+
+   CheckStandardVO getVOById(String id);
+
+
 }

platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -144,12 +144,51 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
     }
 
     @Override
-    public AbstractPageResultBean<CheckStandard> selectPageInfo(CheckStandardDTO record, int pageNum, int pageSize) {
+    public AbstractPageResultBean<CheckStandardVO> selectPage(CheckStandardDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        AbstractPageResultBean<CheckStandard> pageInfo = new MyPage(mapper.selectList(record));
+        AbstractPageResultBean<CheckStandardVO> pageInfo = new MyPage(mapper.selectList(record));
         return pageInfo;
     }
 
+    @Override
+    public CheckStandardVO getVOById(String id) {
+        CheckStandard checkStandard = super.getModelById(id);
+  /*      Weekend<CheckStandardParam> weekend = new Weekend<>(CheckStandardParam.class);
+        weekend.weekendCriteria().andEqualTo(CheckStandardParam::getStandardId, id);
+        List<CheckStandardParam> paramList = paramMapper.selectByExample(weekend);
+        checkStandard.setParamList(paramList);*/
+
+
+
+        if(checkStandard == null){
+            throw new BusinessException("保养标准已经删除，该任务无需执行，请删除该任务");
+        }
+        CheckStandardVO vo = BeanConverterUtil.copyObjectProperties(checkStandard,CheckStandardVO.class);
+        Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
+        weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, checkStandard.getId());
+        List<SysFile> sysFiles = sysFileService.getListByTargetAndType(checkStandard.getId(), null);
+        List<SysFile> checkImgList = ListUtils.newArrayList();
+        List<SysFile> checkFileList = ListUtils.newArrayList();
+        sysFiles.forEach(item -> {
+            if (item.getType().equals( SysFileTypeEnum.CHECK_STANDARD_IMGS.getValue())) {
+                checkImgList.add(item);
+            }
+            if (item.getType().equals( SysFileTypeEnum.CHECK_STANDARD_FILES.getValue())) {
+                checkFileList.add(item);
+            }
+        });
+        vo.setCheckImgList(checkImgList);
+        vo.setCheckFileList(checkFileList);
+        SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(vo.getSbId());
+        if(sbInfo != null){
+            vo.setPositionNo(sbInfo.getPositionNo());
+        }
+        // 备件列表
+        List<CheckStandardSpareVO> spareList = spareService.selectVOListByCheckId(checkStandard.getId());
+        vo.setDetailList(spareList);
+        return vo;
+    }
+
     /**
      * 编码需要查询最大的编码，然后+1，
      * 编码格式：五位，补零，00001

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));