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/dto/JgVehicleInformationDto.java

@@ -148,7 +148,7 @@ public class JgVehicleInformationDto extends BaseDto {
     @ApiModelProperty(value = "号牌号码")
     private String carNumber;
 
-    @ApiModelProperty(value = "识别代码")
+    @ApiModelProperty(value = "车架号码")
     private String identificationCode;
 
     @ApiModelProperty(value = "发动机号")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgVehicleInformation.java

@@ -275,7 +275,7 @@ public class JgVehicleInformation extends BaseEntity {
     private String carNumber;
 
     /**
-     * 识别代码
+     * 车架号码
      */
 	@TableField("identification_code")
     private String identificationCode;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java

@@ -138,7 +138,7 @@ public class JgVehicleInformationVo implements Serializable {
     @ApiModelProperty(value = "号牌号码")
     private String carNumber;
 
-    @ApiModelProperty(value = "识别代码")
+    @ApiModelProperty(value = "车架号码")
     private String identificationCode;
 
     @ApiModelProperty(value = "发动机号")

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

@@ -145,13 +145,22 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             throw new LocalBadRequest("车牌号码已存在，请重新输入！");
         }
 
-        // 【A109】 车用气瓶登记业务 识别代码 校验唯一性
+        // 发动机号 字段的唯一性校验
+        LambdaQueryWrapper<JgVehicleInformation> engineWrapper = new LambdaQueryWrapper<>();
+        engineWrapper.eq(JgVehicleInformation::getEngineNumber, vehicleInfoDto.getEngineNumber());
+        engineWrapper.ne(!ValidationUtil.isEmpty(vehicleInfoDto.getSequenceNbr()), JgVehicleInformation::getSequenceNbr, vehicleInfoDto.getSequenceNbr());
+        Integer enginecount = this.baseMapper.selectCount(engineWrapper);
+        if (enginecount > 0) {
+            throw new LocalBadRequest("发动机号已存在，请重新输入！");
+        }
+
+        // 【A109】 车用气瓶登记业务 车架号 校验唯一性
         LambdaQueryWrapper<JgVehicleInformation> informationLambdaQueryWrapper = new LambdaQueryWrapper<>();
         informationLambdaQueryWrapper.eq(JgVehicleInformation::getIdentificationCode, vehicleInfoDto.getIdentificationCode());
         informationLambdaQueryWrapper.eq(JgVehicleInformation::getIsDelete, false);
         Integer identificationCodeCount = this.baseMapper.selectCount(informationLambdaQueryWrapper);
         if (identificationCodeCount > 0) {
-            throw new BadRequest("识别代码已存在，请重新输入！");
+            throw new BadRequest("车架号已存在，请重新输入！");
         }
 
         // 使用单位信息