车辆出行统计页面 修改

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleDepartureLog.java

@@ -101,4 +101,6 @@ public class VehicleDepartureLog {
     String departureRemark;
 
     String arrivalRemark;
+
+
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/DepartureLogVo.java

@@ -32,4 +32,27 @@ public class DepartureLogVo extends VehicleDepartureLog {
      */
     private  String numberPlate;
 
+
+    /**
+     * 接受公司
+     */
+    private  String arrivalName;
+
+
+    /**
+     * 出车公司
+     */
+    private  String departureName;
+
+    /**
+     * 公里数统计
+     */
+
+    private  Integer mileage;
+
+    /**
+     * 时间天数统计
+     */
+    private  String departureDay;
+
 }

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

@@ -87,7 +87,7 @@
     </select>
     <select id="selectVoAll" resultMap="searchBookRecord">
         select vehicle_departure_log.*,vehicle.number_plate,bc2.actual_end_date,bc2.actual_start_date,bc2.book_start_date,bc2.book_end_date,
-        /* IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0)*/
+         IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0),
         CONCAT(IFNULL(floor((unix_timestamp(vehicle_departure_log.arrival_time) -
         unix_timestamp(vehicle_departure_log.departure_time)) / 86400),0),'天',
         IFNULL(floor(IF((unix_timestamp(vehicle_departure_log.arrival_time) -
@@ -135,7 +135,7 @@
     </select>
     <select id="selectVoAllNotAllData" resultMap="searchBookRecord">
         select vehicle_departure_log.*,vehicle.number_plate,bc2.actual_end_date,bc2.actual_start_date,bc2.book_start_date,bc2.book_end_date,
-        /*IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0)*/
+        IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0),
         CONCAT(IFNULL(floor((unix_timestamp(vehicle_departure_log.arrival_time) -
         unix_timestamp(vehicle_departure_log.departure_time)) / 86400),0),'天',
         IFNULL(floor(IF((unix_timestamp(vehicle_departure_log.arrival_time) -