fix(jg)：历史气瓶新增重复使用登记证Bug修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -223,7 +223,7 @@
         WHERE LENGTH(t.use_registration_code) = 14
         AND SUBSTR(t.use_registration_code, 1, 1) IN ('容', '锅', '管', '瓶', '梯', '起', '索', '游', '车')
         AND TRIM(t.use_registration_code) LIKE concat('%(',#{year},')')
-        AND (tjur.reg_type IS NULL OR tjur.reg_type = 2)
+        AND (tjur.reg_type IS NULL OR tjur.reg_type = '2' OR tjur.reg_type = '0')
         AND tjur.is_delete = 0
         GROUP BY SUBSTR(t.use_registration_code, 1, 5)
         HAVING code <![CDATA[ <> ]]> '00000'

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

@@ -755,7 +755,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             String useRegistrationCode = String.valueOf(equipmentInfoForm.get("useRegistrationCode")).trim();
             String equipId = String.valueOf(equipmentInfoForm.get("RECORD"));
             // 校验使用登记证编号的唯一性
-            if (commonService.useRegistrationCertificateAccountUnique(useRegistrationCode, equipId)) {
+            if (!CylinderTypeEnum.CYLINDER.getCode().equals(equipmentInfoForm.get("EQU_CATEGORY")) && commonService.useRegistrationCertificateAccountUnique(useRegistrationCode, equipId)) {
                 throw new BadRequest("使用登记证编号已存在！");
             }
             String regType = Optional.ofNullable(equipmentInfoForm.get("EQU_LIST"))