车辆出车记录

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/VehicleDepartureService.java

@@ -2,7 +2,6 @@ package com.xinxincaravan.caravan.vehicle.biz;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xinxincaravan.caravan.vehicle.entity.VehicleDepartureLog;
 import com.xinxincaravan.caravan.vehicle.mapper.VehicleDepartureLogMapper;
 import com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureLogVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,9 +13,9 @@ public class VehicleDepartureService {
     @Autowired
     VehicleDepartureLogMapper vehicleDepartureLogMapper;
 
-    public PageInfo<VehicleDepartureLog> page(Integer page, Integer limit) {
+    public PageInfo<VehicleDepartureLogVo> page(String numberPlate, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(vehicleDepartureLogMapper.selectAll());
+        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAll(numberPlate));
     }
 
     public PageInfo<VehicleDepartureLogVo> findByVehicle(String vehicleId, Integer page, Integer limit) {

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/mapper/VehicleDepartureLogMapper.java

@@ -2,6 +2,7 @@ package com.xinxincaravan.caravan.vehicle.mapper;
 
 import com.xinxincaravan.caravan.vehicle.entity.VehicleDepartureLog;
 import com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureLogVo;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 import java.util.List;
@@ -11,4 +12,6 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
     VehicleDepartureLog selectLastByVehicleId(String vehicleId);
 
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
+
+    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate);
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/VehicleDepartureController.java

@@ -18,12 +18,12 @@ public class VehicleDepartureController {
     VehicleDepartureService vehicleDepartureService;
 
     @GetMapping("page")
-    public RestResponse page(Integer page, Integer limit) {
+    public RestResponse page(String numberPlate, Integer page, Integer limit) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
         }
-        return RestResponse.suc(vehicleDepartureService.page(page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, page, limit));
     }
 
     @GetMapping("findByVehicle")

vehicle/src/main/resources/mapper/VehicleDepartureLogMapper.xml

@@ -16,5 +16,16 @@
         where vehicle_id = #{vehicleId}
         order by create_time desc
     </select>
+    <select id="selectVoAll" resultType="com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureLogVo">
+        select vehicle_departure_log.*,vehicle.number_plate
+        from vehicle_departure_log
+        left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
+        <trim prefix="where">
+            <if test="numberPlate != null">
+                vehicle.number_plate = #{numberPlate}
+            </if>
+        </trim>
+        order by create_time desc
+    </select>
 
 </mapper>
\ No newline at end of file