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

@@ -170,22 +170,24 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         vehicleInfoDto.setPromoter(reginParams.getUserModel().getUserId());
 
         // 车牌号码 字段的唯一性校验
-        LambdaQueryWrapper<JgVehicleInformation> vehicleInfoWrapper = new LambdaQueryWrapper<>();
-        vehicleInfoWrapper.eq(JgVehicleInformation::getCarNumber, vehicleInfoDto.getCarNumber());
-        vehicleInfoWrapper.eq(JgVehicleInformation::getIsDelete, false);
-        vehicleInfoWrapper.ne(JgVehicleInformation::getStatus, "已作废");
-        vehicleInfoWrapper.ne(!ValidationUtil.isEmpty(vehicleInfoDto.getSequenceNbr()), JgVehicleInformation::getSequenceNbr, vehicleInfoDto.getSequenceNbr());
+        LambdaQueryWrapper<JgVehicleInformation> vehicleInfoWrapper = new LambdaQueryWrapper<JgVehicleInformation>()
+                .eq(JgVehicleInformation::getCarNumber, vehicleInfoDto.getCarNumber())
+                .eq(JgVehicleInformation::getIsDelete, false)
+                .ne(JgVehicleInformation::getStatus, "已作废")
+                .ne(JgVehicleInformation::getStatus, "使用单位待提交")
+                .ne(!ValidationUtil.isEmpty(vehicleInfoDto.getSequenceNbr()), JgVehicleInformation::getSequenceNbr, vehicleInfoDto.getSequenceNbr());
         Integer count = this.baseMapper.selectCount(vehicleInfoWrapper);
         if (count > 0) {
             throw new LocalBadRequest("车牌号码已存在，请重新输入！");
         }
 
         // 【A109】 车用气瓶登记业务 车辆VIN码 校验唯一性
-        LambdaQueryWrapper<JgVehicleInformation> informationLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        informationLambdaQueryWrapper.eq(JgVehicleInformation::getIdentificationCode, vehicleInfoDto.getIdentificationCode());
-        informationLambdaQueryWrapper.eq(JgVehicleInformation::getIsDelete, false);
-        informationLambdaQueryWrapper.ne(JgVehicleInformation::getStatus, "已作废");
-        informationLambdaQueryWrapper.ne(!ValidationUtil.isEmpty(vehicleInfoDto.getSequenceNbr()), JgVehicleInformation::getSequenceNbr, vehicleInfoDto.getSequenceNbr());
+        LambdaQueryWrapper<JgVehicleInformation> informationLambdaQueryWrapper = new LambdaQueryWrapper<JgVehicleInformation>()
+                .eq(JgVehicleInformation::getIdentificationCode, vehicleInfoDto.getIdentificationCode())
+                .eq(JgVehicleInformation::getIsDelete, false)
+                .ne(JgVehicleInformation::getStatus, "已作废")
+                .ne(JgVehicleInformation::getStatus, "使用单位待提交")
+                .ne(!ValidationUtil.isEmpty(vehicleInfoDto.getSequenceNbr()), JgVehicleInformation::getSequenceNbr, vehicleInfoDto.getSequenceNbr());
         Integer identificationCodeCount = this.baseMapper.selectCount(informationLambdaQueryWrapper);
         if (identificationCodeCount > 0) {
             throw new BadRequest("车辆VIN码已存在，请重新输入！");