fix(jg):审核机构变更车牌号时新车牌号未进行全局唯一校验，可以输入已经发放的车牌号

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/event/listener/ChangeFieldWatchConstants.java

@@ -10,7 +10,7 @@ public class ChangeFieldWatchConstants {
     public static final Set<String> USE_CERT_MONITORED_FIELDS =
             Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
                     "equDefine", "equCode", "useInnerCode", "factoryNum",
-                    "province", "city", "county", "street", "address", "useOrgCode"
+                    "province", "city", "county", "street", "address", "useOrgCode", "carNumber"
             )));
 
     /**

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

@@ -96,7 +96,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     CmWorkflowServiceImpl cmWorkflowService;
     @Autowired
     private JgChangeRegistrationUnitMapper JgChangeRegistrationUnitMapper;
-
+    @Autowired
+    private IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
     @Autowired
     RegistrationInfoMapper tzsJgRegistrationInfoMapper;
     @Autowired
@@ -1139,6 +1140,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             registration.setProcessAdvice(dto.getProcessAdvice());
             List<String> roleListAll = new ArrayList<>();
             ArrayList<String> roleList = new ArrayList<>();
+            dto.getRegistrationList().forEach(v -> {
+                String newCarNumber = String.valueOf(v.get("newCarNumber"));
+                String useOrgCode = String.valueOf(v.get("useRegistrationCode"));
+                if (!ObjectUtils.isEmpty(newCarNumber)) {
+                    // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
+                    Integer count = idxBizJgRegisterInfoMapper.checkCarNumberUniqueness(newCarNumber, useOrgCode);
+                    if (count > 0) {
+                        throw new BadRequest("车牌号已存在，请重新输入！");
+                    }
+                }
+            });
 
             //组装信息
             TaskResultDTO task = new TaskResultDTO();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

@@ -69,4 +69,13 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
             "    AND (jri.car_number = CAST(#{carNumber} AS VARCHAR) OR CAST(#{carNumber} AS VARCHAR) IS NULL)\n" +
             "    AND (jri.record <> CAST(#{record} AS VARCHAR) OR CAST(#{record} AS VARCHAR) IS NULL)")
     Integer checkCarNumberUniquenessWithHisCC(@Param("carNumber") String carNumber, @Param("record") String record);
+
+    @Select("SELECT COUNT(*)\n" +
+            "    FROM idx_biz_jg_register_info jri\n" +
+            "    INNER JOIN idx_biz_jg_other_info joi\n" +
+            "    ON jri.RECORD = joi.RECORD\n" +
+            "    WHERE joi.CLAIM_STATUS = '已认领'\n" +
+            "    AND (jri.car_number = CAST(#{carNumber} AS VARCHAR) OR CAST(#{carNumber} AS VARCHAR) IS NULL)\n" +
+            "    AND (jri.use_org_code <> CAST(#{useOrgCode} AS VARCHAR) OR CAST(#{useOrgCode} AS VARCHAR) IS NULL)")
+    Integer checkCarNumberUniqueness(@Param("carNumber") String carNumber, @Param("useOrgCode") String useOrgCode);
 }