fix(JG)：车用气瓶驳回Bug修改，单位办理，个人Bug修改，导入添加otherInfo表

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/PressureVesselListener.java

@@ -45,6 +45,7 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
     List<IdxBizJgRegisterInfo> registerInfoList = new ArrayList<>();
     List<IdxBizJgDesignInfo> designInfoList = new ArrayList<>();
     List<IdxBizJgFactoryInfo> factoryInfoList = new ArrayList<>();
+    List<IdxBizJgOtherInfo> otherInfoList = new ArrayList<>();
     List<IdxBizJgTechParamsVessel> paramsVesselList = new ArrayList<>();
     List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = new ArrayList<>();
     List<ESEquipmentCategoryDto> esEquipmentCategoryList = new ArrayList<>();
@@ -53,6 +54,7 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
     private IIdxBizJgUseInfoService idxBizJgUseInfoService;
     private IdxBizJgDesignInfoServiceImpl idxBizJgDesignInfoService;
     private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
+    private IIdxBizJgOtherInfoService idxBizJgOtherInfoService;
     private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
     private IdxBizJgTechParamsVesselServiceImpl idxBizJgTechParamsVesselService;
     private IdxBizJgInspectionDetectionInfoServiceImpl idxBizJgInspectionDetectionInfoService;
@@ -243,6 +245,13 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
                         .toInstant()));
         inspectionDetectionInfoList.add(inspectionDetectionInfo);
 
+        // 其他信息
+        IdxBizJgOtherInfo otherInfo = new IdxBizJgOtherInfo();
+        BeanUtils.copyProperties(data, otherInfo);
+        otherInfo.setRecord(record);
+        otherInfo.setRecDate(date);
+        otherInfoList.add(otherInfo);
+
         //技术参数
         IdxBizJgTechParamsVessel paramsVessel = new IdxBizJgTechParamsVessel();
         BeanUtils.copyProperties(data, paramsVessel);
@@ -302,6 +311,9 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
         if (!factoryInfoList.isEmpty()) {
             idxBizJgFactoryInfoService.saveBatch(factoryInfoList);
         }
+        if (!otherInfoList.isEmpty()) {
+            idxBizJgOtherInfoService.saveBatch(otherInfoList);
+        }
         if (!paramsVesselList.isEmpty()) {
             idxBizJgTechParamsVesselService.saveBatch(paramsVesselList);
         }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
+import java.util.List;
 
 /**
  * 安全追溯-其他信息表接口类
@@ -14,4 +15,6 @@ public interface IIdxBizJgOtherInfoService {
     boolean saveOrUpdateData(IdxBizJgOtherInfo otherInfo);
 
     IdxBizJgOtherInfo getOneData(String record);
+
+    void saveBatch(List<IdxBizJgOtherInfo> otherInfoList);
 }

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

@@ -27,4 +27,9 @@ public class IdxBizJgOtherInfoServiceImpl extends BaseService<IdxBizJgOtherInfoD
     public IdxBizJgOtherInfo getOneData(String record) {
         return this.getOne(new QueryWrapper<IdxBizJgOtherInfo>().eq("RECORD", record));
     }
+
+    @Override
+    public void saveBatch(List<IdxBizJgOtherInfo> otherInfoList) {
+        super.saveBatch(otherInfoList);
+    }
 }
\ No newline at end of file

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

@@ -1481,7 +1481,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      */
     private void setRepeatUsedCheckFilterParam(BoolQueryBuilder boolMust, String companyCode, String bizType) {
         Set<String> records = EquipUsedCheckStrategyContext.getUsedStrategy(bizType).getEquipInFlow(companyCode);
-        if (records.size() > 0) {
+        if (records != null && !records.isEmpty()) {
             boolMust.mustNot(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", records));
         }
     }
@@ -1958,6 +1958,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         listener.setIdxBizJgUseInfoService(idxBizJgUseInfoService);
         listener.setIdxBizJgDesignInfoService(idxBizJgDesignInfoService);
         listener.setIdxBizJgFactoryInfoService(idxBizJgFactoryInfoService);
+        listener.setIdxBizJgOtherInfoService(iIdxBizJgOtherInfoService);
         listener.setIdxBizJgTechParamsVesselService(idxBizJgTechParamsVesselService);
         listener.setIdxBizJgInspectionDetectionInfoService(idxBizJgInspectionDetectionInfoService);
         listener.setCommonService(commonService);

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

@@ -553,11 +553,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             CompanyBo company = reginParams.getCompany();
 
             List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
-            if (org.springframework.util.CollectionUtils.isEmpty(equipmentLists) || equipmentLists.stream()
-                    .map(v -> (String) v.get("EQU_DEFINE_CODE"))
+            if (CollectionUtils.isEmpty(equipmentLists) || equipmentLists.stream()
+                    .map(v -> (String) v.get("equDefine"))
                     .distinct()
                     .count() != 1) {
-                throw new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同设备种类！");
+                throw new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同设备品种！");
             }
             // 提交时进行校验设备是否在流程中使用（并发及同时打开多个相同的页面时才会出现此种情况）
             checkForRepeatUsedEquip(map, equipmentLists, reginParams);
@@ -1423,7 +1423,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (ValidationUtil.isEmpty(useRegistration.getUseUnitName())) {
             throw new BadRequest("使用登记证导出失败,使用单位名称为空!");
         }
-        exportParamsMap.put("useUnitName", useRegistration.getUseUnitName());
+        exportParamsMap.put("useUnitName",useRegistration.getUseUnitName().contains("_") ?
+                        useRegistration.getUseUnitName().split("_")[1] :
+                        useRegistration.getUseUnitName());
+
         // 监管码
         if (ValidationUtil.isEmpty(useRegistration.getSupervisoryCode())) {
             throw new BadRequest("使用登记证导出失败,监管码为空!");

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/companyCodeRegName.json

@@ -15,7 +15,7 @@
   "610332": "宝鸡市高新技术产业开发区行政审批服务局",
   "610402": "秦都区市场监督管理局",
   "610404": "渭城区市场监督管理局",
-  "610405": "咸阳高新技术产业开发区行政审批服务局",
+  "610405": "咸阳市市场监督管理局高新技术产业开发区分局",
   "610406": "咸阳市市场监督管理局经济技术开发区分局",
   "610422": "三原县市场监督管理局",
   "610423": "泾阳县市场监督管理局",

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -279,7 +279,7 @@
     "type": "118",
     "pageType": "edit",
     "name": "车用气瓶登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1770004458848153602&roleIds={roleIds}&userId={userId}&pageType=edit"
+    "url": "/mixuap?appId=1742358052905971713&id=1770004751216308226&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "118",