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/converter/DictParamsConverter.java

@@ -67,7 +67,10 @@ public class DictParamsConverter implements Converter<String> {
         dictMap.put("D级", "5960");
         dictMap.put("GC1", "6002");
         dictMap.put("GC2", "6003");
+        dictMap.put("GC3", "6005");
         dictMap.put("GCD", "6004");
+        dictMap.put("GD1", "6006");
+        dictMap.put("GD2", "6007");
         dictMap.put("压缩天然气", "COMPRESSED_NATURAL_GAS");
         dictMap.put("液化天然气", "LIQUEFIED_NATURAL_GAS");
         dictMap.put("液化石油气", "LIQUEFIED_PETROLEUM_GAS");

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -146,6 +146,15 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
                                   @Param("produceUnitCreditCode") String produceUnitCreditCode);
 
     /**
+     * 查询出厂编码是否重复
+     *
+     * @param factoryNum 出厂编码
+     * @return Integer
+     */
+    List<Map<String, Object>> checkFactoryNumUniqueWithUseName(@Param("factoryNum") String factoryNum,
+                                            @Param("produceUnitCreditCode") String produceUnitCreditCode);
+
+    /**
      * 使用登记证编号全库唯一校验
      *
      * @param useRegistrationCode

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

@@ -991,6 +991,20 @@
             AND ibjfi."RECORD" <![CDATA[ <> ]]> #{record}
         </if>
     </select>
+    <select id="checkFactoryNumUniqueWithUseName" resultType="java.util.Map">
+        SELECT
+        ibjui.USE_UNIT_NAME as useUnitName,
+        COUNT(1)
+        FROM idx_biz_jg_factory_info ibjfi
+        LEFT JOIN idx_biz_jg_register_info ibjri ON ibjfi."RECORD" = ibjri."RECORD"
+        LEFT JOIN idx_biz_jg_other_info joi ON joi."RECORD" = ibjfi."RECORD"
+        LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui."RECORD" = ibjri."RECORD"
+        WHERE ibjri.EQU_LIST = '2000'
+        AND ibjri.EQU_CATEGORY = '2300'
+        AND ibjfi.FACTORY_NUM = #{factoryNum}
+        AND ibjfi.PRODUCE_UNIT_CREDIT_CODE = #{produceUnitCreditCode}
+        AND joi.CLAIM_STATUS = '已认领'
+    </select>
 
     <select id="useRegistrationCertificateAccountUnique" resultType="java.lang.Integer">
         SELECT COUNT( 1 )