fix(JG)：车用气瓶-使用登记证生成规则修改

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/JgVehicleInformationServiceImpl.java

@@ -31,6 +31,8 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
@@ -110,6 +112,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     private IdxBizJgOtherInfoMapper otherInfoMapper;
     @Autowired
     private JgUseRegistrationServiceImpl jgUseRegistrationService;
+    @Autowired
+    private IdxBizJgInspectionDetectionInfoServiceImpl idxBizJgInspectionDetectionInfoService;
 
     /**
      * 新增（提交）车用气瓶
@@ -126,6 +130,19 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         if (CollectionUtils.isEmpty(equipmentLists)) {
             throw new BadRequest("请选择设备");
         }
+
+        List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoService.checkInspectionInfo(
+                equipmentLists.stream()
+                        .map(v -> (String) v.get("record"))
+                        .collect(Collectors.toList())
+        );
+        if (inspectionDetectionInfoList.stream().anyMatch(info ->
+                ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
+                        ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()) ||
+                        ObjectUtils.isEmpty(info.getInspectOrgName()))) {
+            throw new BadRequest("请补充设备检验检测信息后提交！");
+        }
+
         CompanyBo company = reginParams.getCompany();
         vehicleInfoDto.setCreateDate(new Date());
         vehicleInfoDto.setPromoter(reginParams.getUserModel().getUserId());
@@ -142,10 +159,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         // 使用单位信息
         vehicleInfoDto.setUseUnitName(company.getCompanyName());
         vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode());
-        List<LinkedHashMap> tree = commonService.getCreatTree();
 
         // 接收单位信息
         if (!StringUtils.isEmpty(vehicleInfoDto.getReceiveOrgCode())) {
+            List<LinkedHashMap> tree = commonService.getCreatTree();
             String[] splitReceiveOrgCode = vehicleInfoDto.getReceiveOrgCode().split("_");
             String orgCode = this.recursiveMatching(tree, splitReceiveOrgCode[0]);
             vehicleInfoDto.setReceiveOrgCode(orgCode);
@@ -612,7 +629,15 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             jgVehicleInformation.setNextExecuteUserIds("");
 
             // 生成使用登记证编号
-            String code = this.getUseRegistrationCode(jgVehicleInformation.getVehicleApanage());
+            String receiveCompanyCode = jgVehicleInformation.getReceiveCompanyCode();
+            CompanyModel receiveCompanyResult = Privilege.companyClient.queryByCompanyCode(receiveCompanyCode).getResult();
+            //查询到局级
+            // 如果不是局级公司，则查询其上级公司信息
+            if (!"prefecture-level".equals(receiveCompanyResult.getLevel())) {
+                CompanyModel receiveParentResult = Privilege.companyClient.seleteOne(receiveCompanyResult.getParentId()).getResult();
+                receiveCompanyCode = receiveParentResult.getCompanyCode();
+            }
+            String code = generateVehicleUseRegistrationCode(receiveCompanyCode);
             jgVehicleInformation.setUseRegistrationCode(code);
             jgVehicleInformation.setAuditPassDate(new Date());
 
@@ -856,7 +881,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
      * @return String
      * @deprecated 根据车辆属地生成使用登记证
      */
-    public String getUseRegistrationCode(String vehicleApa) {
+    private String generateVehicleUseRegistrationCode(String vehicleApa) {
         StringBuilder useRegistration = new StringBuilder("容3T");
         if (!ObjectUtils.isEmpty(vehicleApa)) {
             ResponseModel<String> stringResponseModel = tzsServiceFeignClient.useRegistrationCode(useRegistration.append(VehicleApanageEnum.of(vehicleApa)) + "");