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

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

@@ -15,6 +15,9 @@ public enum ResCode {
     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,"车辆编码和车牌号为空"),
+    VEHICLE_INFO_SAME_NUM_PLATE_AND_CODE_EXIST(102004,"车辆编码或车牌号已存在"),
+
 
     //车辆信息相关返回码-预定申请信息
     VEHICLE_BOOKED_RECORD_ALREADY_CHANGED(103001,"车辆预定申请已被审批，请刷新后继续操作"),

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java

@@ -32,11 +32,11 @@ public class VehiclePageQueryVo {
      */
     private Integer subordinateBranch;
     /**
-     * 所属分支机构（id）
+     * 所属省份（id）
      */
     private Integer addrProvince;
     /**
-     * 所属分支机构（id）
+     * 所属市区（id）
      */
     private Integer addrCity;
 

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

@@ -200,17 +200,19 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
 
         for(AddOrUpdateVehicleVo addOrUpdateVehicleVo:addOrUpdateVehicleVoList) {
             Vehicle vehicle = new Vehicle();
-            BeanUtils.copyProperties(vehicle, addOrUpdateVehicleVo);
+            BeanUtilsBean.getInstance().copyProperties(vehicle, addOrUpdateVehicleVo);
             vehicle.setId(UUID.randomUUID().toString());
 //            检查车牌或者编码是否已存在，已存在则返回失败
             List<Vehicle> exitsVehicles = lockByCode(addOrUpdateVehicleVo);
             if(CollectionUtils.isNotEmpty(exitsVehicles)){
-                if(addOrUpdateVehicleVo.getCode()!= null &&
-                        addOrUpdateVehicleVo.getCode().equals(exitsVehicles.get(0).getCode())){
-                    return RestResponse.code(ResCode.VEHICLE_INFO_CODE_EXIST.getCode());
-                }else{
                     return RestResponse.code(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode());
-                }
+
+//                if(addOrUpdateVehicleVo.getCode()!= null &&
+//                        addOrUpdateVehicleVo.getCode().equals(exitsVehicles.get(0).getCode())){
+//                    return RestResponse.code(ResCode.VEHICLE_INFO_CODE_EXIST.getCode());
+//                }else{
+//                    return RestResponse.code(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode());
+//                }
             }
             mapper.insertSelective(vehicle);
         }
@@ -223,9 +225,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
      * @param addOrUpdateVehicleVo
      * @return 锁定成功返回
      */
-    private List<Vehicle> lockByCode(AddOrUpdateVehicleVo addOrUpdateVehicleVo){
-        if(addOrUpdateVehicleVo.getCode() == null){
-            return null;
+    private List<Vehicle> lockByCode(AddOrUpdateVehicleVo addOrUpdateVehicleVo)throws CustomIllegalParamException{
+//        if(addOrUpdateVehicleVo.getCode() == null){
+//            return null;
+//        }
+
+        if(addOrUpdateVehicleVo.getNumberPlate() == null){
+            throw new CustomIllegalParamException("Without a license plate number");
         }
         List<Vehicle> vehicles = mapper.lockByCode(addOrUpdateVehicleVo);
         return vehicles;
@@ -244,7 +250,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
 
         for(AddOrUpdateVehicleVo addOrUpdateVehicleVo:addOrUpdateVehicleVoList){
             Vehicle vehicle = new Vehicle();
-            BeanUtils.copyProperties(vehicle, addOrUpdateVehicleVo);
+            BeanUtilsBean.getInstance().copyProperties(vehicle, addOrUpdateVehicleVo);
             //悲观锁，检查是否已存在车牌或编码
             List<Vehicle> exitsVehicles = lockByCode(addOrUpdateVehicleVo);
             if(CollectionUtils.isNotEmpty(exitsVehicles)){
@@ -252,12 +258,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
                     if(exitsVehicle.getId().equals(addOrUpdateVehicleVo.getId())){
                         continue;
                     }
-                    if(addOrUpdateVehicleVo.getCode()!= null &&
-                            addOrUpdateVehicleVo.getCode().equals(exitsVehicles.get(0).getCode())){
-                        return RestResponse.code(ResCode.VEHICLE_INFO_CODE_EXIST.getCode());
-                    }else{
                         return RestResponse.code(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode());
-                    }
+
+//                    if(addOrUpdateVehicleVo.getCode()!= null &&
+//                            addOrUpdateVehicleVo.getCode().equals(exitsVehicles.get(0).getCode())){
+//                        return RestResponse.code(ResCode.VEHICLE_INFO_CODE_EXIST.getCode());
+//                    }else{
+//                        return RestResponse.code(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode());
+//                    }
                 }
             }
             mapper.updateByPrimaryKeySelective(vehicle);

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

@@ -44,7 +44,7 @@
         v.expect_destination_branch_company_id,
         bc1.name as expectDestinationBranchCompanyName,
         v.subordinate_branch,
-        bc2.name as subBranchName,
+--         bc2.name as subBranchName,
         v.use_type,
         v.remark,
         v.create_time,
@@ -79,7 +79,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="mRangeDateEnd !=null">
@@ -158,7 +158,7 @@
             )
         </if>
         order by v.code
-        ) r ORDER BY r.subBranchName
+        ) r ORDER BY r.parkBranchCompanyName
     </select>
 
     <select id="getByPageNotAllData" parameterType="java.util.Map"
@@ -176,7 +176,7 @@
         v.expect_destination_branch_company_id,
         bc1.name as expectDestinationBranchCompanyName,
         v.subordinate_branch,
-        bc2.name as subBranchName,
+--         bc2.name as subBranchName,
         v.use_type,
         v.remark,
         v.create_time,
@@ -227,12 +227,12 @@
                 </foreach>
             </trim>
             )
-            or v.subordinate_branch in (
-            <trim suffixOverrides=",">
-                <foreach collection="companyList" item="companyId">
-                    #{companyId},
-                </foreach>
-            </trim>
+<!--            or v.subordinate_branch in (-->
+<!--            <trim suffixOverrides=",">-->
+<!--                <foreach collection="companyList" item="companyId">-->
+<!--                    #{companyId},-->
+<!--                </foreach>-->
+<!--            </trim>-->
             )
             )
             )
@@ -261,9 +261,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>
@@ -312,7 +312,7 @@
             )
         </if>
         order by v.code
-        ) r ORDER BY r.subBranchName
+        ) r ORDER BY r.parkBranchCompanyName
     </select>
 
     <select id="lockByCode" resultType="com.xxfc.platform.vehicle.entity.Vehicle"
@@ -323,7 +323,8 @@
             v.number_plate
         from vehicle v
         where
-            `code` = #{code}
+--             `code` = #{code} or
+            numberPlate=#{numberPlate}
         for update
     </select>
     <select id="selectByNumberPlate" resultType="com.xxfc.platform.vehicle.entity.Vehicle">