Merge branch 'master-vehicle-count-bug' into dev

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

 package com.xxfc.platform.vehicle.rest;
 
+import com.alibaba.fastjson.JSONArray;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
@@ -170,8 +171,8 @@ public class VehicleDepartureController {
     @GetMapping("findReserveType")
     public ObjectRestResponse<OrderPageVO> getOrderDetail() {
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        String reserveType = dictionaryMap.get(VEHICE_ORDER + "_" + RESERVE).getName();
-        return ObjectRestResponse.succ(reserveType);
+        String reserveType = dictionaryMap.get(VEHICE_ORDER + "_" + RESERVE).getDetail();
+        return ObjectRestResponse.succ(JSONArray.parse(reserveType));
     }
 
 

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

@@ -595,12 +595,12 @@
         SELECT
         b.id AS companyId,
         DATE_FORMAT(
-        DATE_SUB(NOW(), INTERVAL 1 DAY),
+        NOW(),
         '%Y'
         ) AS countYear,
-        DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY), '%m') AS countMonth,
-        DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY), '%u') AS countWeek,
-        DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY), '%Y-%m-%d') AS countDate,
+        DATE_FORMAT(NOW(), '%m') AS countMonth,
+        DATE_FORMAT(NOW(), '%u') AS countWeek,
+        DATE_FORMAT(NOW(), '%Y-%m-%d') AS countDate,
         count(*) AS vehicleNum
         FROM
         vehicle v