Merge remote-tracking branch 'origin/dev' into dev

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

 package com.xxfc.platform.vehicle.rest;
 
+import cn.hutool.json.JSONUtil;
 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;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -174,5 +176,17 @@ public class VehicleDepartureController {
         return ObjectRestResponse.succ(reserveType);
     }
 
-
+    /**
+     * 车辆用途字典查询
+     * 除去用户租车
+     */
+    @GetMapping("findReservePartType")
+    public ObjectRestResponse<OrderPageVO> getOrderPartDetail() {
+        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        String reserveType = dictionaryMap.get(VEHICE_ORDER + "_" + RESERVE).getDetail();
+        HashMap<String, List<Map<String, String>>> map = JSONUtil.toBean(reserveType, HashMap.class);
+        List<Map<String, String>> type = map.get("type");
+        type.remove(0);
+        return ObjectRestResponse.succ(type);
+    }
 }