修改车辆信息

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MemberLevelController.java

@@ -5,7 +5,6 @@ import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;

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

@@ -56,7 +56,10 @@ public class ResultVehicleVo {
      */
     private String parkBranchCompanyName;
 
-
+    /**
+     * 所属公司名称
+     */
+    private String companyName;
 
     /**
      * 目的地分支机构（id）

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

@@ -88,6 +88,10 @@ public class VehicleExcelVo {
     private String insuranceNo;
 
 
+    /**
+     * 所属公司名称
+     */
+    private String companyName;
 
 
     /**

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

@@ -76,6 +76,7 @@
         v.vehicle_inner_status,
         v.mileage_last_update as mileage,
         c.val as useTypeName,
+        ci.name as companyName,
         vm.name as vehicleType
         <if test=" yearMonthAndParam != null ">
             ,vbi.booked_date
@@ -96,6 +97,7 @@
         LEFT JOIN vehicle_book_record v2 on v2.id = (select id from vehicle_book_record where vehicle_id = v.id order by update_time DESC LIMIT 1)
         LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
+        LEFT JOIN company_info ci on ci.id = bc2.company_id
         LEFT JOIN (select * from constant where  type = 2) c ON  v.use_type = c.code
         where
         v.is_del=0
@@ -229,6 +231,7 @@
         v.vehicle_inner_status,
         v.mileage_last_update as mileage,
         c.val as useTypeName,
+        ci.name as companyName,
         vm.name as vehicleType
         <if test=" yearMonthAndParam !=null ">
             ,vbi.booked_date
@@ -247,6 +250,7 @@
         LEFT JOIN vehicle_book_record v2 on v2.id = (select id from vehicle_book_record where vehicle_id = v.id order by update_time DESC LIMIT 1)
         LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
+        LEFT JOIN company_info ci on ci.id = bc2.company_id
         LEFT JOIN (select * from constant where  type = 2) c ON  v.use_type = c.code
         where
         v.is_del=0
@@ -361,6 +365,7 @@
         v.number_plate,
         bc.name as parkBranchCompanyName,
         c.val as useType,
+        ci.name as companyName,
         vm.name as vehicleType
         from vehicle v
         <if test=" yearMonthAndParam != null  ">
@@ -378,6 +383,7 @@
         LEFT JOIN vehicle_book_record v2 on v2.vehicle_id = v.id
         LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
+        LEFT JOIN company_info ci on ci.id = bc2.company_id
         LEFT JOIN (select * from constant where  type = 2) c ON  v.use_type = c.code
         where
         v.is_del=0