添加车辆信息下载

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

@@ -29,7 +29,7 @@ public class VehicleExcelVo {
     /**
      *
      */
-    private String useType;
+    private String useTypeName;
 
 
     /**

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java

@@ -16,9 +16,7 @@ public interface VehicleMapper extends Mapper<Vehicle> {
 
     public   List<ResultVehicleVo> getByPageNotAllData(Map<String, Object> params);
 
-    List<VehicleExcelVo> getVehicleExcelVo(Map<String, Object> params);
 
-    List<VehicleExcelVo> getVehicleExcelVoNotAllData(Map<String, Object> params);
 
     public int updateStatusById(Map<String, Object> params);
 

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

@@ -51,7 +51,7 @@ public class VehicleInformationDownloadController extends BaseController<Vehicle
         writer.addHeaderAlias("numberPlate", "车牌号");
         writer.addHeaderAlias("code", "车辆编码");
         writer.addHeaderAlias("vehicleType", "车型");
-        writer.addHeaderAlias("useType", "用途");
+        writer.addHeaderAlias("useTypeName", "用途");
         writer.addHeaderAlias("parkBranchCompanyName", "停靠分公司");
         // 一次性写出内容，使用默认样式，强制输出标题
         writer.write(rows, true);

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

@@ -72,6 +72,7 @@
         v.update_time,
         v.model_id,
         v.mileage_last_update as mileage,
+        c.val as useTypeName,
         vm.name as vehicleType
         <if test=" yearMonthAndParam != null ">
             ,vbi.booked_date
@@ -92,6 +93,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 (select * from constant where  type = 2) c ON  v.use_type = c.code
         where
         v.is_del=0
         <if test="mRangeDateEnd !=null">
@@ -217,6 +219,7 @@
         v.update_time,
         v.model_id,
         v.mileage_last_update as mileage,
+        c.val as useTypeName,
         vm.name as vehicleType
         <if test=" yearMonthAndParam !=null ">
             ,vbi.booked_date
@@ -233,6 +236,7 @@
         -- 所属分公司
         LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
         LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
+        LEFT JOIN (select * from constant where  type = 2) c ON  v.use_type = c.code
         where
         v.is_del=0
         <if test="companyList != null">