修改天数展示

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

@@ -19,5 +19,5 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
 
     Integer selectMileageByVehicleId(String vehicleId);
 
-    Integer selectDayByVehicleId(String vehicleId);
+    String selectDayByVehicleId(String vehicleId);
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/vo/VehicleDepartureLogVo.java

@@ -23,5 +23,5 @@ public class VehicleDepartureLogVo {
     Integer mileage;
     Integer state;
     String numberPlate;
-    Integer departureDay;
+    String departureDay;
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/vo/VehicleDepartureStatisticDataVo.java

@@ -14,7 +14,7 @@ public class VehicleDepartureStatisticDataVo {
     /**
      * 出车天数
      */
-    Integer departureDay;
+    String departureDay;
     /**
      * 出车公里数
      */

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

@@ -17,7 +17,12 @@
         order by create_time desc
     </select>
     <select id="selectVoAll" resultType="com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureLogVo">
-        select vehicle_departure_log.*,vehicle.number_plate,IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0) as departureDay,
+        select vehicle_departure_log.*,vehicle.number_plate,
+       /* 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) - unix_timestamp(vehicle_departure_log.departure_time))>86400,(unix_timestamp(vehicle_departure_log.arrival_time)
+        - unix_timestamp(vehicle_departure_log.departure_time)) MOD 86400/3600,(unix_timestamp(vehicle_departure_log.arrival_time) - unix_timestamp(vehicle_departure_log.departure_time))/3600)),0),'小时')
+       as departureDay,
         IF((IFNULL(vehicle_departure_log.mileage_end,0)-IFNULL(vehicle_departure_log.mileage_start,0))>0,IFNULL(vehicle_departure_log.mileage_end,0)-IFNULL(vehicle_departure_log.mileage_start,0),0) as mileage
         from vehicle_departure_log
         left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
@@ -43,7 +48,12 @@
         order by create_time desc
     </select>
     <select id="selectVoAllNotAllData" resultType="com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureLogVo">
-        select vehicle_departure_log.*,vehicle.number_plate,IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0) as departureDay,
+        select vehicle_departure_log.*,vehicle.number_plate,
+        /*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) - unix_timestamp(vehicle_departure_log.departure_time))>86400,(unix_timestamp(vehicle_departure_log.arrival_time)
+        - unix_timestamp(vehicle_departure_log.departure_time)) MOD 86400/3600,(unix_timestamp(vehicle_departure_log.arrival_time) - unix_timestamp(vehicle_departure_log.departure_time))/3600)),0),'小时')
+        as departureDay,
         IF((IFNULL(vehicle_departure_log.mileage_end,0)-IFNULL(vehicle_departure_log.mileage_start,0))>0,IFNULL(vehicle_departure_log.mileage_end,0)-IFNULL(vehicle_departure_log.mileage_start,0),0) as mileage
         from vehicle_departure_log
         left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
@@ -88,10 +98,21 @@
         from vehicle_departure_log
         where vehicle_id = #{vehicleId};
     </select>
-    <select id="selectDayByVehicleId" resultType="int">
-        select sum(to_days(arrival_time) - to_days(departure_time))
-        from vehicle_departure_log
-        where vehicle_id = #{vehicleId};
+    <select id="selectDayByVehicleId" resultType="String">
+        SELECT
+	CONCAT(IFNULL(floor(t.total_expire_minute / 86400),0),'天',IFNULL(floor(IF(t.total_expire_minute>86400,t.total_expire_minute MOD 86400/3600,
+	t.total_expire_minute/3600)),0),'小时')
+   FROM
+	(
+		SELECT
+			SUM(
+				unix_timestamp(arrival_time) - unix_timestamp(departure_time)
+			) AS total_expire_minute
+		FROM
+			vehicle_departure_log
+		WHERE
+			vehicle_id =#{vehicleId}
+	) t
     </select>
 
 </mapper>
\ No newline at end of file