Commit 6ed7394f authored by jiaorz's avatar jiaorz

出行列表添加出车时间和还车时间筛选

parent 274d680a
...@@ -36,7 +36,7 @@ public class VehicleDepartureController { ...@@ -36,7 +36,7 @@ public class VehicleDepartureController {
/** /**
* @param numberPlate 车牌 * @param numberPlate 车牌
* @param code 车辆编码 * @param code 车辆编码
* @param time * @param
* @param departureId 出发分公司id * @param departureId 出发分公司id
* @param page * @param page
* @param limit * @param limit
...@@ -65,7 +65,7 @@ public class VehicleDepartureController { ...@@ -65,7 +65,7 @@ public class VehicleDepartureController {
@GetMapping("small/page") @GetMapping("small/page")
@IgnoreUserToken @IgnoreUserToken
public RestResponse pageBySmall(String numberPlate, @RequestParam(value = "code", required = false) Integer code, String time, Integer page, Integer limit, Integer uid, HttpServletRequest request) { public RestResponse pageBySmall(String numberPlate, @RequestParam(value = "code", required = false) Integer code, String startTime, String endTime,Integer page, Integer limit, Integer uid, HttpServletRequest request) {
if (page == null || limit == null) { if (page == null || limit == null) {
page = 1; page = 1;
limit = 10; limit = 10;
...@@ -74,10 +74,10 @@ public class VehicleDepartureController { ...@@ -74,10 +74,10 @@ public class VehicleDepartureController {
if (userDTO != null) { if (userDTO != null) {
if (userDTO.getDataAll() == 2) { if (userDTO.getDataAll() == 2) {
List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany()); List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, null,null, time, page, limit, companyList)); return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, null,null, startTime,endTime, page, limit, companyList));
} }
} }
return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, null,null, time, page, limit)); return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, null,null, startTime,endTime, page, limit));
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment