fix(jg):暂存功能问题处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/common/DataDockTemplateVersionUtils.java

@@ -43,7 +43,7 @@ public class DataDockTemplateVersionUtils {
         VERSION_MAP.put("工业管道设备", "V1.0.0");
         VERSION_MAP.put("公用管道设备", "V1.0.0");
         VERSION_MAP.put("历史无证_压力容器设备_氧舱", "V1.0.1");
-        VERSION_MAP.put("历史无证设备_场内机动车辆", "V1.0.0");
+        VERSION_MAP.put("历史无证设备_场内机动车辆", "V1.0.1");
         VERSION_MAP.put("历史无证设备_电梯设备", "V1.0.1");
         VERSION_MAP.put("历史无证设备_管道设备", "V1.0.0");
         VERSION_MAP.put("历史无证设备_锅炉设备", "V1.0.0");
@@ -71,7 +71,7 @@ public class DataDockTemplateVersionUtils {
         VERSION_MAP.put("新设备_压力容器设备_固定式", "V1.0.1");
         VERSION_MAP.put("新设备_压力容器设备_氧舱", "V1.0.1");
         VERSION_MAP.put("新设备_游乐设施设备", "V1.0.0");
-        VERSION_MAP.put("压力容器设备", "V1.0.1");
+        VERSION_MAP.put("压力容器设备", "V1.0.2");
         VERSION_MAP.put("长输管道设备", "V1.0.0");
     }
 

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

@@ -94,7 +94,6 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
             log.info("解析第{}行数据：{}", rowIndex, JSON.toJSONString(data));
             // 检查各字段是否为空，如果为空则追加错误信息
             checkNotBlank(data.getProductName(), "设备名称不能为空");
-            checkNotBlank(data.getBrandName(), "品牌名称不能为空");
             checkNotBlank(data.getEquType(), "设备型号不能为空");
             checkNotBlank(data.getUseInnerCode(), "单位内部编号不能为空");
             if (useInnerCodeList.contains(data.getUseInnerCode())) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/MaintainNoticeStrategyHandler.java

@@ -24,7 +24,8 @@ public class MaintainNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
         Map<String, Object> basic = new HashMap<>();
         basic.put("type", ApplicationFormTypeEnum.WXGZ.getBusinessCode());
         basic.put("receiveOrgCreditCode", maintainInfo.get("receiveOrgCreditCode"));
-
+        basic.put("code", maintainInfo.get("EQU_LIST_CODE"));
+        basic.put("equCategory", maintainInfo.get("EQU_CATEGORY_CODE"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", maintainInfo);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/ReformNoticeStrategyHandler.java

@@ -23,6 +23,8 @@ public class ReformNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
         Map<String, Object> basic = new HashMap<>();
         basic.put("type", ApplicationFormTypeEnum.GZGZ.getBusinessCode());
         basic.put("receiveOrgCreditCode", reformNotice.get("receiveOrgCode"));
+        basic.put("code", reformNotice.get("EQU_LIST_CODE"));
+        basic.put("equCategory", reformNotice.get("EQU_CATEGORY_CODE"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", reformNotice);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/RegistrationReformStrategyHandler.java

@@ -25,6 +25,7 @@ public class RegistrationReformStrategyHandler implements ToBeSubmitDetailStrate
         basic.put("receiveOrgCreditCode1", notice.get("receiveCompanyCode"));
         basic.put("businessScenarios", "0");
         basic.put("code", notice.get("EQU_LIST_CODE"));
+        basic.put("equCategory", notice.get("EQU_CATEGORY_CODE"));
         Map<String, Object> responseDetail = (Map<String, Object>) notice.get("responseDetail");
         if (responseDetail != null) {
             responseDetail.put("techInfo", notice.get("techInfo"));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/TransferNoticeStrategyHandler.java

@@ -24,7 +24,8 @@ public class TransferNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
         Map<String, Object> basic = new HashMap<>();
         basic.put("type", ApplicationFormTypeEnum.YZGZ.getBusinessCode());
         basic.put("receiveOrgCreditCode", transferInfo.get("receiveOrgCreditCode"));
-
+        basic.put("code", transferInfo.get("EQU_LIST_CODE"));
+        basic.put("equCategory", transferInfo.get("EQU_CATEGORY_CODE"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", transferInfo);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/UseRegistrationStrategyHandler.java

@@ -25,6 +25,8 @@ public class UseRegistrationStrategyHandler implements ToBeSubmitDetailStrategy
         basic.put("type", ApplicationFormTypeEnum.SYDJ.getBusinessCode());
         basic.put("businessScenarios", "0");
         basic.put("receiveOrgCreditCode1", notice.get("receiveOrgCode"));
+        basic.put("code", notice.get("EQU_LIST_CODE"));
+        basic.put("equCategory", notice.get("EQU_CATEGORY_CODE"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", notice);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/VehicleRegistrationStrategyHandler.java

@@ -30,6 +30,7 @@ public class VehicleRegistrationStrategyHandler implements ToBeSubmitDetailStrat
         basic.put("receiveOrgCreditCode1", vo.getReceiveOrgCode());
         basic.put("businessScenarios", "1");
         basic.put("code", "2300");
+        basic.put("equCategory", "23T0");
         Map<String, Map<String, Object>> result = new HashMap<>();
         useRegFormUpload.put("useRegistrationFormUrl", vo.getUseRegistrationFormUrl());
         result.put("notice", Bean.BeantoMap(vo));

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

@@ -3616,7 +3616,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
         List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();
 
-        if (!equipmentParamsForm.isEmpty()){
         // 电梯
         if (EquipmentClassifityEnum.DT.getCode().equals(equList)) {
             IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsElevator.class);
@@ -3746,7 +3745,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             protectionDevicesList = this.getAccessoryEntity(equipmentParamsForm, subFormProtectionDevicesList, EQUIP_PROTECTIONDEVICES_FORM_ID, record, date, operateType);
 
         }
-        }
 
         // 八大类技术参数和主要零部件和安全附件表
         if (!ValidationUtil.isEmpty(mainPartsList)) {
@@ -4666,9 +4664,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 //            checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", result);
             //checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", result);
             if ("0".equals(data.getWhetherVehicleCylinder())) {
-                checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
-                if (!StringUtils.isEmpty(data.getFactoryNum())){
-                    checkFactoryNumUnique(data.getFactoryNum(), data.getProduceUnitCreditCode(),data.getProduceUnitName(), result);
+//                checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
+                if (!StringUtils.isEmpty(data.getFactoryNum()) && !StringUtils.isEmpty(data.getProduceUnitCreditCode())){
+                    checkFactoryNumUnique(data.getFactoryNum(), data.getProduceUnitCreditCode(), data.getProduceUnitName(), result);
                 }
             } else {
                 if (!StringUtils.isEmpty(data.getFactoryNum())){