fix(jg):历史设备登记场车设备可以更改车牌号

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

@@ -292,6 +292,7 @@
              jri.PRODUCT_PHOTO                                                      as productPhoto,
              jri.BRAND_NAME                                                         as brandName,
              jri.EQU_PRICE                                                          as equPrice,
+             jri.CAR_NUMBER as carNumber,
              jfi.FACTORY_NUM                                                        as factoryNum,
              jfi.PRODUCE_UNIT_NAME                                                  as produceUnitName,
              date_format(jfi.PRODUCE_DATE,'%Y-%m-%d')                               as produceDate,

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

@@ -122,6 +122,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private static final String COUNTY = "COUNTY";
     private static final String REGION = "REGION";
     private static final String STREET = "STREET";
+    public static final String CAR_NUMBER = "CAR_NUMBER";
     private ApplicationContext applicationContext;
     @Autowired
     RedisUtils redisUtils;
@@ -3202,6 +3203,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             //使用登记证编号判断是否使用未来系统生成编号
             idxBizJgRegisterInfoService.checkUseRegistrationCode(useRegistrationCode, "set");
 
+            // 场车设备校验车牌号的唯一性
+            if (EquipmentClassifityEnum.CC.getCode().equals(map.get("EQU_LIST_CODE"))) {
+                Integer count = idxBizJgRegisterInfoService.lambdaQuery()
+                        .eq(IdxBizJgRegisterInfo::getCarNumber, map.get(CAR_NUMBER))
+                        .ne(!com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(equipId), IdxBizJgRegisterInfo::getRecord, equipId)
+                        .count();
+                if (count > 0) {
+                    throw new BadRequest("车牌号已存在，请重新输入！");
+                }
+            }
+
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             CompanyBo company = reginParams.getCompany();
             // 使用登记信息
@@ -3345,6 +3357,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 registerInfo.setProductPhoto(JSONObject.toJSONString(map.get("productPhoto")));
                 registerInfo.setOtherAccessoriesReg(JSONObject.toJSONString(map.get("otherAccessoriesReg")));
                 registerInfo.setInstallationIsComplete(map.getOrDefault("installationIsComplete", "1").toString());
+                if (EquipmentClassifityEnum.CC.getCode().equals(map.get("EQU_LIST_CODE"))) {
+                    registerInfo.setCarNumber((String) map.get(CAR_NUMBER));
+                }
                 idxBizJgRegisterInfoMapper.updateById(registerInfo);
 
                 // 设计信息