修改车型列表添加和查询接口2

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java

@@ -12,7 +12,7 @@ public enum ResCode {
     VEHICLE_BOOKED_INFO_ALREADY_CHANGED(101001,"车辆预定信息已更改，请刷新后继续操作"),
 
     //车辆信息相关返回码-车辆信息
-    VEHICLE_INFO_SAME_NUM_PLATE_EXISTS(102001,"该车牌车辆已经存在"),
+    VEHICLE_INFO_SAME_NUM_PLATE_EXISTS(102001,"该车牌已经存在"),
     VEHICLE_INFO_BRANCH_NOT_EXIST(102002,"分公司信息非法"),
     VEHICLE_INFO_CODE_EXIST(102003,"车辆编码已存在"),
     VEHICLE_INFO_SAME_NUM_PLATE_AND_CODE_EMPTY(102004,"车辆编码和车牌号为空"),

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -200,12 +200,16 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
 
         for(AddOrUpdateVehicleVo addOrUpdateVehicleVo:addOrUpdateVehicleVoList) {
             Vehicle vehicle = new Vehicle();
+            if (vehicle.getParkBranchCompanyId()==null) {
+                throw new CustomIllegalParamException("Stop at branch office cannot be empty");
+            }
             BeanUtilsBean.getInstance().copyProperties(vehicle, addOrUpdateVehicleVo);
             vehicle.setId(UUID.randomUUID().toString());
 //            检查车牌或者编码是否已存在，已存在则返回失败
             List<Vehicle> exitsVehicles = lockByCode(addOrUpdateVehicleVo);
             if(CollectionUtils.isNotEmpty(exitsVehicles)){
-                    return RestResponse.code(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode());
+                    return RestResponse.codeAndMessage(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode(),
+                            ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getDesc());
 
 //                if(addOrUpdateVehicleVo.getCode()!= null &&
 //                        addOrUpdateVehicleVo.getCode().equals(exitsVehicles.get(0).getCode())){
@@ -250,6 +254,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
 
         for(AddOrUpdateVehicleVo addOrUpdateVehicleVo:addOrUpdateVehicleVoList){
             Vehicle vehicle = new Vehicle();
+            if (vehicle.getParkBranchCompanyId()==null) {
+                throw new CustomIllegalParamException("Stop at branch office cannot be empty");
+            }
             BeanUtilsBean.getInstance().copyProperties(vehicle, addOrUpdateVehicleVo);
             //悲观锁，检查是否已存在车牌或编码
             List<Vehicle> exitsVehicles = lockByCode(addOrUpdateVehicleVo);
@@ -258,7 +265,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
                     if(exitsVehicle.getId().equals(addOrUpdateVehicleVo.getId())){
                         continue;
                     }
-                        return RestResponse.code(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode());
+                    return RestResponse.codeAndMessage(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode(),
+                            ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getDesc());
 
 //                    if(addOrUpdateVehicleVo.getCode()!= null &&
 //                            addOrUpdateVehicleVo.getCode().equals(exitsVehicles.get(0).getCode())){

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -106,9 +106,9 @@
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
         </if>
-        <if test="subordinateBranch !=null">
-            and v.subordinate_branch = #{subordinateBranch}
-        </if>
+<!--        <if test="subordinateBranch !=null">-->
+<!--            and v.subordinate_branch = #{subordinateBranch}-->
+<!--        </if>-->
         <if test="code !=null">
             and v.code = #{code}
         </if>
@@ -209,7 +209,7 @@
         -- 目的地分公司
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         -- 所属分公司
-        LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
+--         LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
         where
         v.is_del=0
         <if test="companyList != null">
@@ -323,9 +323,11 @@
             v.number_plate
         from vehicle v
         where
---             `code` = #{code} or
-            numberPlate=#{numberPlate}
+            number_plate=#{numberPlate}
+            and is_del=0
         for update
+
+
     </select>
     <select id="selectByNumberPlate" resultType="com.xxfc.platform.vehicle.entity.Vehicle">
         select * from vehicle