Merge branch 'develop_tzs_test' of http://39.100.92.250:5000/moa/amos-boot-biz…

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

@@ -5226,19 +5226,22 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             //checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空；", result);
 //            checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", result);
             //checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", result);
-//            if ("0".equals(data.getWhetherVehicleCylinder())) {
-////                checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
-//                if (!StringUtils.isEmpty(data.getFactoryNum()) && !StringUtils.isEmpty(data.getProduceUnitCreditCode())){
-//                    checkFactoryNumUnique(data.getFactoryNum(), data.getProduceUnitCreditCode(), data.getProduceUnitName(), result);
-//                    if (factoryNumList.contains(data.getProduceUnitCreditCode() + "_" +data.getFactoryNum())){
-//                        result.append("同一制造单位下，出厂编码不能重复！；");
-//                    }
-//                }
-//            } else {
-//                if (!StringUtils.isEmpty(data.getFactoryNum())){
-//                    checkFactoryNumUniquenessForVehicleCylinder(data.getFactoryNum(), result);
-//                }
-//            }
+            if ("0".equals(data.getWhetherVehicleCylinder())) {
+//                checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
+                checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空；", result);
+                checkNotBlank(data.getFactoryNum(), "出厂编号/产品编号不能为空；", result);
+                if (!StringUtils.isEmpty(data.getFactoryNum()) && !StringUtils.isEmpty(data.getProduceUnitCreditCode())){
+                    checkFactoryNumUnique(data.getFactoryNum(), data.getProduceUnitCreditCode(), data.getProduceUnitName(), result);
+                    if (factoryNumList.contains(data.getProduceUnitCreditCode() + "_" +data.getFactoryNum())){
+                        result.append("同一制造单位下，出厂编码不能重复！；");
+                    }
+                    factoryNumList.add(data.getProduceUnitCreditCode() + "_" +data.getFactoryNum());
+                }
+            } else {
+                if (!StringUtils.isEmpty(data.getFactoryNum())){
+                    checkFactoryNumUniquenessForVehicleCylinder(data.getFactoryNum(), result);
+                }
+            }
 //            checkNotBlank(data.getProduceDate(), "制造日期不能为空；", result);
             Optional.ofNullable(data.getProduceDate()).ifPresent(v -> checkDateFormatCorrect(v, "制造日期格式不正确；", result));
             //checkNotBlank(data.getInspectOrgName(), "检测机构名称不能为空；", result);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -3100,6 +3100,7 @@ public class JGDPStatisticsServiceImpl {
                 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 String formattedDate = dateFormat.format(auditPassDate);
                 objMap.put("REGISTRATION_DATE", formattedDate);
+                objMap.put("REGISTRATION_ORG_NAME", jgUseRegistrationManage.getReceiveOrgName());
             });
         }
         return objMap;

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_1000.json

@@ -157,7 +157,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_2000.json

@@ -161,7 +161,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
 
@@ -173,7 +173,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
@@ -184,7 +184,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECTION_DATE", "label": "下次检验日期" },
         { "key": "CAR_NUMBER", "label": "车牌号" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_3000.json

@@ -157,7 +157,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
         { "key": "ME_UNIT_NAME", "label": "维保单位名称" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_4000.json

@@ -153,7 +153,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_5000.json

@@ -149,7 +149,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_6000.json

@@ -143,7 +143,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_8000.json

@@ -150,7 +150,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
 
@@ -162,7 +162,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_9000.json

@@ -149,7 +149,7 @@
         { "key": "FULLAREA", "label": "所属区域" },
         { "key": "FULLADDRESS", "label": "设备详细地址" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
-        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
         { "key": "REGISTRATION_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],