Commit 9a0ca2de by 高晓磊

查询派单记录和运输记录去掉开始时间和结束时间不能有一个为空的校验

parent aa1673f4
...@@ -91,6 +91,4 @@ public class TransportRecordController { ...@@ -91,6 +91,4 @@ public class TransportRecordController {
return ResponseObj.success("查询成功", byId); return ResponseObj.success("查询成功", byId);
} }
} }
...@@ -120,10 +120,10 @@ public class VehicleDriverUserController { ...@@ -120,10 +120,10 @@ public class VehicleDriverUserController {
@RequestParam(value = "vehicleId", required = false) UUID vehicleId, @RequestParam(value = "vehicleId", required = false) UUID vehicleId,
@RequestParam(value = "isOrderByPlanCycleType", required = false, defaultValue = "true") Boolean isOrderByPlanCycleType @RequestParam(value = "isOrderByPlanCycleType", required = false, defaultValue = "true") Boolean isOrderByPlanCycleType
) { ) {
boolean a = (startDate == null && endDate != null) || (startDate != null && endDate == null); // boolean a = (startDate == null && endDate != null) || (startDate != null && endDate == null);
if (a) { // if (a) {
return ResponseObj.error("请同时输入开始和结束时间"); // return ResponseObj.error("请同时输入开始和结束时间");
} // }
DriverUser driverUser = DriverUserContextHolder.getContext().getDriverUser(); DriverUser driverUser = DriverUserContextHolder.getContext().getDriverUser();
Page<KObject> kObject = vehicleDriverUserService.pageByVehicleId(pageNo, pageSize, status, vehicleId, startDate, endDate, isOrderByPlanCycleType, driverUser.getId()); Page<KObject> kObject = vehicleDriverUserService.pageByVehicleId(pageNo, pageSize, status, vehicleId, startDate, endDate, isOrderByPlanCycleType, driverUser.getId());
...@@ -162,10 +162,10 @@ public class VehicleDriverUserController { ...@@ -162,10 +162,10 @@ public class VehicleDriverUserController {
@DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(name = "endDate", required = false) Date endDate, @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(name = "endDate", required = false) Date endDate,
@RequestParam(value = "vehicleId", required = false) UUID vehicleId @RequestParam(value = "vehicleId", required = false) UUID vehicleId
) { ) {
boolean a = (startDate == null && endDate != null) || (startDate != null && endDate == null); // boolean a = (startDate == null && endDate != null) || (startDate != null && endDate == null);
if (a) { // if (a) {
return ResponseObj.error("请同时输入开始和结束时间"); // return ResponseObj.error("请同时输入开始和结束时间");
} // }
DriverUser driverUser = DriverUserContextHolder.getContext().getDriverUser(); DriverUser driverUser = DriverUserContextHolder.getContext().getDriverUser();
Page<Map<String, Object>> kObject = vehicleDriverUserService.transportRecordPage(pageNo, pageSize, vehicleId, startDate, endDate, driverUser.getId()); Page<Map<String, Object>> kObject = vehicleDriverUserService.transportRecordPage(pageNo, pageSize, vehicleId, startDate, endDate, driverUser.getId());
......
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