fix(jg)：【现场需求】气瓶充装介质添加 >>>溶解乙炔 Dissolve_Acetylene 介质 <<<

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/ChargingMediumConverter.java

@@ -28,6 +28,7 @@ public class ChargingMediumConverter implements Converter<String> {
         EXCEL_TO_JAVA_MAP.put("氩气", "ARGON");
         EXCEL_TO_JAVA_MAP.put("液氩", "LIQUID_ARGON");
         EXCEL_TO_JAVA_MAP.put("液氮", "LIQUID_NITROGEN");
+        EXCEL_TO_JAVA_MAP.put("溶解乙炔", "DISSOLVE_ACETYLENE");
 
         JAVA_TO_EXCEL_MAP.put("LIQUEFIED_NATURAL_GAS", "液化天然气");
         JAVA_TO_EXCEL_MAP.put("LIQUEFIED_PETROLEUM_GAS", "液化石油气");
@@ -43,6 +44,7 @@ public class ChargingMediumConverter implements Converter<String> {
         JAVA_TO_EXCEL_MAP.put("ARGON", "氩气");
         JAVA_TO_EXCEL_MAP.put("LIQUID_ARGON", "液氩");
         JAVA_TO_EXCEL_MAP.put("LIQUID_NITROGEN", "液氮");
+        JAVA_TO_EXCEL_MAP.put("DISSOLVE_ACETYLENE", "溶解乙炔");
     }
 
     @Override

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

@@ -113,7 +113,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      * @param useRegistrationCode
      * @return
      */
-    Integer useRegistrationCertificateAccountUnique(String useRegistrationCode);
+    Integer useRegistrationCertificateAccountUnique(@Param("useRegistrationCode") String useRegistrationCode,@Param("equipId") String equipId);
 
     /**
      * 查询维保超期的设备

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

@@ -879,6 +879,7 @@
             "amos_tzs_biz"."idx_biz_jg_register_info"
         WHERE
             "USE_ORG_CODE" = #{useRegistrationCode}
+            AND "RECORD" != #{equipId}
     </select>
 
     <select id="queryOutOfMaintenanceRecord" resultType="java.util.Map">

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

@@ -2125,8 +2125,8 @@ public class CommonServiceImpl implements ICommonService {
      * @param useRegistrationCode 登记证编号
      * @return true ： 已经存在      false ：不存在
      */
-    public Boolean useRegistrationCertificateAccountUnique(String useRegistrationCode) {
-        Integer count = commonMapper.useRegistrationCertificateAccountUnique(useRegistrationCode);
+    public Boolean useRegistrationCertificateAccountUnique(String useRegistrationCode, String equipId) {
+        Integer count = commonMapper.useRegistrationCertificateAccountUnique(useRegistrationCode, equipId);
         if (count > 0) {
             return true;
         }

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

@@ -2213,7 +2213,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
                 inspectionDetectionInfo.setRecord(record);
                 inspectionDetectionInfo.setRecDate(date);
-                if (!equipmentInfoForm.get(WHETHER_VEHICLE_CYLINDER).equals("1")) { // 老旧车用气瓶有些制造监督检验已过期，可放开选择定期检验
+                if (!"1".equals(equipmentInfoForm.get(WHETHER_VEHICLE_CYLINDER))) { // 老旧车用气瓶有些制造监督检验已过期，可放开选择定期检验
                     inspectionDetectionInfo.setInspectType("8300".equals(equCategory) ? "AZJDJY" : "ZZJDJY");
                 }
                 inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));

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

@@ -2629,8 +2629,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         try {
             // 使用登记证编号
             String useRegistrationCode = String.valueOf(map.get("useOrgCode")).trim();
+            String equipId = String.valueOf(map.get("equipId"));
             //校验使用登记证编号的唯一性
-            Boolean used = commonServiceImpl.useRegistrationCertificateAccountUnique(useRegistrationCode);
+            Boolean used = commonServiceImpl.useRegistrationCertificateAccountUnique(useRegistrationCode, equipId);
             if (used){
                 throw new BadRequest("使用登记证编号已存在！");
             }

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

@@ -1679,11 +1679,11 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
     public List<JgVehicleInformation> saveOrUpdateHisData(JSONObject map) {
-
         // 使用登记证编号
         String useRegistrationCode1 = String.valueOf(map.get("useRegistrationCode")).trim();
+        String equipId = String.valueOf(map.get("equipId"));
         //校验使用登记证编号的唯一性
-        Boolean used = commonService.useRegistrationCertificateAccountUnique(useRegistrationCode1);
+        Boolean used = commonService.useRegistrationCertificateAccountUnique(useRegistrationCode1, equipId);
         if (used){
             throw new BadRequest("使用登记证编号已存在！");
         }