优化

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

@@ -11,7 +11,7 @@ public class VehicleBookRecordQueryVo extends PageParam {
     /**
      * 车辆编号，0-没有
      */
-    private Integer vehicleCode;
+    private Integer code;
 
     /**
      * 车牌号，空字符串-没有

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

@@ -9,6 +9,11 @@ import java.util.List;
 @Data
 public class VehiclePlanDto extends PageParam {
 
+    /**
+     * 车辆编号
+     */
+    private Integer code;
+
     @ApiModelProperty(value = "车辆Id")
     private String vehicleId;
 

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

@@ -32,9 +32,9 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     @Autowired
     VehicleMapper vehicleMapper;
 
-    public PageInfo<VehicleDepartureLogVo> page(String numberPlate, String time, Integer page, Integer limit) {
+    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code, String time, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(mapper.selectVoAll(numberPlate, time));
+        return new PageInfo<>(mapper.selectVoAll(numberPlate,code, time));
     }
 
     public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate, String time, Integer page, Integer limit, List<Integer> companyList) {

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

@@ -51,9 +51,9 @@ public class VehicleUpkeepService {
         vehicleUpkeepItemMapper.deleteByPrimaryKey(id);
     }
 
-    public PageInfo<VehicleUpkeepLogVo> pageLog(String numberPlate, Integer page, Integer limit, List<Integer> companyList) {
+    public PageInfo<VehicleUpkeepLogVo> pageLog(String numberPlate, Integer code,Integer page, Integer limit, List<Integer> companyList) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(vehicleUpkeepLogMapper.selectVoAll(numberPlate, companyList));
+        return new PageInfo<>(vehicleUpkeepLogMapper.selectVoAll(numberPlate, code, companyList));
     }
 
     public List<VehicleUpkeepItem> getUpkeepsByIds(List<Integer> ids) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleDepartureLogMapper.java

@@ -14,7 +14,7 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
 
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
     List<VehicleDepartureLog> selectByVehicle(String vehicleId);
-    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate, @Param("time") String time);
+    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate,@Param("code") Integer code, @Param("time") String time);
 
     List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("time") String time, @Param("companyList") List<Integer> companyList);
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleUpkeepLogMapper.java

@@ -9,7 +9,7 @@ import tk.mybatis.mapper.common.Mapper;
 import java.util.List;
 
 public interface VehicleUpkeepLogMapper extends Mapper<VehicleUpkeepLog> {
-    List<VehicleUpkeepLogVo> selectVoAll(@Param("numberPlate") String numberPlate, @Param("companyList")List<Integer> companyList);
+    List<VehicleUpkeepLogVo> selectVoAll(@Param("numberPlate") String numberPlate, @Param("code") Integer code, @Param("companyList")List<Integer> companyList);
 
     VehicleUpkeepLogVo selectVoById(Integer id);
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleDepartureController.java

@@ -34,7 +34,7 @@ public class VehicleDepartureController {
     private UserAuthConfig userAuthConfig;
 
     @GetMapping("page")
-    public RestResponse page(String numberPlate, String time, Integer page, Integer limit, HttpServletRequest request) {
+    public RestResponse page(String numberPlate,@RequestParam(value = "code",required = false) Integer code,String time, Integer page, Integer limit, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -46,12 +46,12 @@ public class VehicleDepartureController {
                 return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, time, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate, time, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate,code, time, page, limit));
     }
 
     @GetMapping("small/page")
     @IgnoreUserToken
-    public RestResponse pageBySmall(String numberPlate, String time,Integer page, Integer limit, Integer uid,HttpServletRequest request) {
+    public RestResponse pageBySmall(String numberPlate,@RequestParam(value = "code",required = false) Integer code, String time,Integer page, Integer limit, Integer uid,HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -63,7 +63,7 @@ public class VehicleDepartureController {
                 return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate,time, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate,time,page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate,code,time,page, limit));
     }
 
     /**

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -332,7 +332,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         Example exa = Example.builder(VehicleModel.class).where(
                 WeekendSqls.<VehicleModel>custom()
                         .andEqualTo(VehicleModel::getIsdel, 0)
-        ).orderByAsc("sort").build();
+        ).orderByDesc("sort").build();
 
         return ObjectRestResponse.succ(baseBiz.selectByExample(exa));
     }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleUpkeepController.java

@@ -112,7 +112,7 @@ public class VehicleUpkeepController {
      * @return
      */
     @GetMapping("log/page")
-    public RestResponse pageLog(String numberPlate, Integer page, Integer limit) {
+    public RestResponse pageLog(String numberPlate, @RequestParam(value = "code",required = false) Integer code, Integer page, Integer limit) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -124,7 +124,7 @@ public class VehicleUpkeepController {
                 companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
             }
         }
-        return RestResponse.suc(vehicleUpkeepService.pageLog(numberPlate, page, limit, companyList));
+        return RestResponse.suc(vehicleUpkeepService.pageLog(numberPlate, code, page, limit, companyList));
     }
 
     /**

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

@@ -61,6 +61,9 @@
                 )
 
             </if>
+            <if test="code!=null">
+               and  vehicle.code=#{code}
+            </if>
         </trim>
         order by create_time desc
     </select>

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

@@ -409,6 +409,9 @@
             <if test="modelId != null and modelId != ''">
                 and v1.model_id = #{modelId}
             </if>
+            <if test="code !=null">
+                and v1.code=#{code}
+            </if>
             and v1.is_del != 1
         </where>
     </select>
@@ -490,6 +493,9 @@
             <if test="status != null">
                 and v1.status = #{status}
             </if>
+            <if test="code !=null">
+                and v1.code=#{code}
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v1.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">

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

@@ -48,6 +48,9 @@
                     )
                 )
             </if>
+            <if test="code !=null">
+               and b.code=#{code}
+            </if>
         </trim>
         order by a.create_time desc
     </select>

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

@@ -61,6 +61,9 @@
             <if test="modelId != null and modelId != ''">
                 and v.model_id = #{modelId}
             </if>
+            <if test="code !=null">
+                and v.code=#{code}
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">