台套认领bugfix

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/EquipClaimServiceImpl.java

@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.UseRegisterCancelEquipEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -332,6 +333,9 @@ public class EquipClaimServiceImpl {
         JSONObject equipParams = JSON.parseObject(toJSONString(json.get(EQUIP_PARAMS_FORM_ID)));
         CompanyBo company = getSelectedOrgInfo().getCompany();
         String useRegistrationCode = Objects.toString(equipInfo.get(USE_REGISTRATION_CODE), null);
+        // 屏蔽掉气瓶的认领
+        this.interceptGasCylinderClaim(equipInfo);
+
         // 参数校验 - 同 设备录入的逻辑
         this.checkParams(new LinkedHashMap<>(equipInfo));
 
@@ -363,6 +367,21 @@ public class EquipClaimServiceImpl {
     }
 
     /**
+     * 屏蔽掉气瓶的认领
+     *
+     * @param equipInfo
+     */
+    private void interceptGasCylinderClaim(JSONObject equipInfo) {
+        // 设备种类
+        String equList = Objects.toString(equipInfo.get(EQU_LIST));
+        // 设备类别
+        String equCategory = Objects.toString(equipInfo.get(EQU_CATEGORY));
+        if (!StringUtils.isEmpty(equList) && equList.equals(EquipmentClassifityEnum.YLRQ.getCode()) && !StringUtils.isEmpty(equCategory) && equCategory.equals(UseRegisterCancelEquipEnum.qp.getCode())) {
+            throw new BadRequest("气瓶设备认领暂未开放！");
+        }
+    }
+
+    /**
      * 台套历史设备登记
      *
      * @param equipInfo
@@ -659,7 +678,6 @@ public class EquipClaimServiceImpl {
      */
     public void addEquipResume(JSONObject equipInfo, BusinessTypeEnum businessTypeEnum, JgUseRegistration useRegistration) {
         String record = (String) equipInfo.get(RECORD);
-        String routePath = useRegistrationService.buildTaskModel(useRegistration, equipInfo, getSelectedOrgInfo());
         JgResumeInfoDto resumeInfoDto = JgResumeInfoDto.builder()
                 .applyNo(null)
                 .businessType(businessTypeEnum.getName())
@@ -669,8 +687,10 @@ public class EquipClaimServiceImpl {
                 .approvalUnitCode(useRegistration.getReceiveOrgName())
                 .status("正常")
                 .changeContent(businessTypeEnum.getName() + "业务")
-                .routePath(routePath)
                 .build();
+        if (!ObjectUtils.isEmpty(useRegistration.getSequenceNbr())) {
+            resumeInfoDto.setRoutePath(useRegistrationService.buildTaskModel(useRegistration, equipInfo, getSelectedOrgInfo()));
+        }
         JgResumeInfo resumeInfo = new JgResumeInfo();
         BeanUtils.copyProperties(resumeInfoDto, resumeInfo);
         jgResumeInfoService.save(resumeInfo);