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

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

@@ -34,17 +34,17 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     @Autowired
     VehicleMapper vehicleMapper;
 
-    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code,Integer zoneId,Integer departureId, String time, Integer page, Integer limit) {
+    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code,Integer zoneId,Integer departureId, String startTime,String endTime, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(mapper.selectVoAll(numberPlate,code,zoneId,departureId,time));
+        return new PageInfo<>(mapper.selectVoAll(numberPlate,code,zoneId,departureId,startTime, endTime));
     }
 
-    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate,Integer code,Integer zoneId,Integer departureId, String time, Integer page, Integer limit, List<Integer> companyList) {
+    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate,Integer code,Integer zoneId,Integer departureId, String startTime,String endTime,  Integer page, Integer limit, List<Integer> companyList) {
         PageHelper.startPage(page, limit);
         if (companyList == null || companyList.size() == 0) {
             companyList = Arrays.asList(-1);
         }
-        return new PageInfo<>(mapper.selectVoAllNotAllData(numberPlate,code,zoneId,departureId,time, companyList));
+        return new PageInfo<>(mapper.selectVoAllNotAllData(numberPlate,code,zoneId,departureId,startTime, endTime, companyList));
     }
 
     public PageInfo<VehicleDepartureLogVo> findByVehicle(String vehicleId, Integer page, Integer limit) {

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

@@ -20,13 +20,16 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
                                             @Param("code") Integer code,
                                             @Param("zoneId") Integer zoneId,
                                             @Param("departureId") Integer departureId,
-                                            @Param("time") String time);
+                                            @Param("startTime") String startTime,
+                                            @Param("endTime") String endTime
+                                            );
 
     List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate,
                                                       @Param("code") Integer code,
                                                       @Param("zoneId") Integer zoneId,
                                                       @Param("departureId") Integer departureId,
-                                                      @Param("time") String time,
+                                                      @Param("startTime") String startTime,
+                                                      @Param("endTime") String endTime,
                                                       @Param("companyList") List<Integer> companyList);
 
     Integer selectMileageByVehicleId(String vehicleId);

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

@@ -45,7 +45,7 @@ public class VehicleDepartureController {
      */
     @GetMapping("page")
     public RestResponse page(String numberPlate,
-                             @RequestParam(value = "code", required = false) Integer code, String time,
+                             @RequestParam(value = "code", required = false) Integer code, String startTime, String endTime,
                              @RequestParam(value = "zoneId",required = false) Integer zoneId,
                              @RequestParam(value = "departureId", required = false) Integer departureId,
                              Integer page, Integer limit, HttpServletRequest request) {
@@ -57,10 +57,10 @@ public class VehicleDepartureController {
         if (userDTO != null) {
             if (userDTO.getDataAll() == 2) {
                 List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, zoneId,departureId, time, page, limit, companyList));
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, code, zoneId,departureId, startTime, endTime, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, zoneId,departureId, time, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, code, zoneId,departureId, startTime, endTime, page, limit));
     }
 
     @GetMapping("small/page")

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

@@ -100,19 +100,18 @@
             <if test="numberPlate != null and numberPlate != ''">
                 and vehicle.number_plate = #{numberPlate}
             </if>
-            <if test="time != null and time != ''">
-                and  (vehicle_departure_log.arrival_time >=  str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
-                or vehicle_departure_log.arrival_time is null
-                )
+            <if test="startTime != null and startTime != ''">
                 and
-                (
-                vehicle_departure_log.departure_time &lt;= str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
+                vehicle_departure_log.departure_time &lt;= str_to_date(#{startTime}, '%Y-%m-%d %H')
+                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{startTime}, '%Y-%m-%d %H'))
                 or vehicle_departure_log.departure_time is null
-                )
 
             </if>
+            <if test="endTime != null and endTime != ''">
+                and  vehicle_departure_log.arrival_time >=  str_to_date(#{endTime}, '%Y-%m-%d %H')
+                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{endTime}, '%Y-%m-%d %H'))
+                or vehicle_departure_log.arrival_time is null
+            </if>
             <if test="code!=null">
                and  vehicle.code=#{code}
             </if>