修改后台车型和标签列表

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

@@ -836,7 +836,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
      * @return
      * @throws Exception
      */
-    public PageDataVO<QueryVehicleVo> getByPage(VehiclePageQueryVo vehiclePageQueryVo) throws Exception{
+    public PageDataVO<ResultVehicleVo> getByPage(VehiclePageQueryVo vehiclePageQueryVo) throws Exception{
         Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
         Integer pageSize = (Integer) params.get("limit");
         params.remove("pageSize");
@@ -846,8 +846,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         adjustBookedInfoParam(params,vehiclePageQueryVo);
         params.get("yearMonthAndParam");
         PageHelper.startPage(pageNo,pageSize);
-        List<QueryVehicleVo> vehicles = mapper.getByPage(params);
-        PageInfo<QueryVehicleVo> vehiclePageInfo = new PageInfo<>(vehicles);
+        List<ResultVehicleVo> vehicles = mapper.getByPage(params);
+        PageInfo<ResultVehicleVo> vehiclePageInfo = new PageInfo<>(vehicles);
         return PageDataVO.pageInfo(vehiclePageInfo);
     }
     /**
@@ -856,7 +856,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
      * @return
      * @throws Exception
      */
-    public PageDataVO<QueryVehicleVo> getByPageNotAllData(VehiclePageQueryVo vehiclePageQueryVo, List<Integer> companyList) throws Exception{
+    public PageDataVO<ResultVehicleVo> getByPageNotAllData(VehiclePageQueryVo vehiclePageQueryVo, List<Integer> companyList) throws Exception{
         Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
         Integer pageSize = (Integer) params.get("limit");
         params.remove("pageSize");
@@ -870,8 +870,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             params.put("companyList", Arrays.asList(-1));
         }
         PageHelper.startPage(pageNo,pageSize);
-        List<QueryVehicleVo> vehicles = mapper.getByPageNotAllData(params);
-        PageInfo<QueryVehicleVo> vehiclePageInfo = new PageInfo<>(vehicles);
+        List<ResultVehicleVo> vehicles = mapper.getByPageNotAllData(params);
+        PageInfo<ResultVehicleVo> vehiclePageInfo = new PageInfo<>(vehicles);
         return PageDataVO.pageInfo(vehiclePageInfo);
     }
 

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

@@ -121,7 +121,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
     }
 
     @RequestMapping(value = "/page", method = RequestMethod.GET)
-    public RestResponse<PageDataVO<QueryVehicleVo>> getByPage(@RequestParam String vehiclePageQueryVoJson) throws Exception {
+    public RestResponse<PageDataVO<ResultVehicleVo>> getByPage(@RequestParam String vehiclePageQueryVoJson) throws Exception {
         VehiclePageQueryVo vehiclePageQueryVo = null;
         try {
             vehiclePageQueryVo = JSON.parseObject(vehiclePageQueryVoJson, VehiclePageQueryVo.class);
@@ -144,7 +144,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
 
     @RequestMapping(value = "/small/page", method = RequestMethod.GET)
     @IgnoreUserToken
-    public RestResponse<PageDataVO<QueryVehicleVo>> getByPageBySmall(@RequestParam String vehiclePageQueryVoJson,@RequestParam Integer uid) throws Exception {
+    public RestResponse<PageDataVO<ResultVehicleVo>> getByPageBySmall(@RequestParam String vehiclePageQueryVoJson,@RequestParam Integer uid) throws Exception {
         VehiclePageQueryVo vehiclePageQueryVo = null;
         try {
             vehiclePageQueryVo = JSON.parseObject(vehiclePageQueryVoJson, VehiclePageQueryVo.class);