车辆详情列表下载

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

@@ -92,27 +92,44 @@ public class ResultVehicleVo {
      */
     private String vin;
 
+
+
     /**
-     * 保险公司，见常量表
+     * 商业险公司，见常量表
      */
     private Integer insuranceCompany;
 
 
     /**
-     * 保险单号
+     * 商业险单号
      */
     private String insuranceNo;
 
     /**
-     * 保险开始时间
+     *  商业险开始时间
      */
     private Date insuranceStartDate;
 
     /**
-     * 保险结束时间
+     *  商业险结束时间
      */
     private Date insuranceEndDate;
 
+    /**
+     * 交强险公司
+     */
+    private String strongInsuranceCompany;
+
+    /**
+     * 交强险单号
+     */
+    private String strongInsuranceNo;
+
+    /**
+     * 交强险时间
+     */
+    private Date strongInsuranceEndDate;
+
     /**
      * 年审时间
      */

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

@@ -5,6 +5,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -64,6 +65,51 @@ public class VehicleExcelVo {
      */
     private String belongToName;
 
+    /**
+     * 车架号
+     */
+    private String vin;
+
+    /**
+     * 发动机号
+     */
+    private String engineNum;
+
+
+    /**
+     * 商业险公司，见常量表
+     */
+    private Integer insuranceCompany;
+
+
+    /**
+     * 商业险单号
+     */
+    private String insuranceNo;
+
+
+
+
+    /**
+     *  商业险结束时间
+     */
+    private Date insuranceEndDate;
+
+    /**
+     * 交强险公司
+     */
+    private String strongInsuranceCompany;
+
+    /**
+     * 交强险单号
+     */
+    private String strongInsuranceNo;
+
+    /**
+     * 交强险时间
+     */
+    private Date strongInsuranceEndDate;
+
 
     public String getStatus() {
         return map.get(status);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleInformationDownloadBiz.java

@@ -99,6 +99,14 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
                         .useTypeName(result.getUseTypeName())
                         .vehicleType(result.getVehicleType())
                         .belongToName(result.getBelongTo()!=null&&result.getBelongTo()==1?"欣新房车有限公司":result.getBelongToName())
+                         .vin(result.getVin())
+                        .engineNum(result.getEngineNum())
+                        .insuranceCompany(result.getInsuranceCompany())
+                         .insuranceNo(result.getInsuranceNo())
+                         .insuranceEndDate(result.getInsuranceEndDate())
+                         .strongInsuranceCompany(result.getStrongInsuranceCompany())
+                         .strongInsuranceNo(result.getInsuranceNo())
+                         .strongInsuranceEndDate(result.getStrongInsuranceEndDate())
                         .build();
                 arrayList.add(build);
             } catch (Exception e) {

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

@@ -60,6 +60,15 @@ public class VehicleInformationDownloadController extends BaseController<Vehicle
         writer.addHeaderAlias("parkBranchCompanyName", "停靠分公司");
         writer.addHeaderAlias("useTypeName", "用途");
         writer.addHeaderAlias("belongToName", "托管人");
+        writer.addHeaderAlias("vin", "车架号");
+        writer.addHeaderAlias("engineNum", "发动机号");
+        writer.addHeaderAlias("insuranceCompany", "商业险公司");
+        writer.addHeaderAlias("insuranceNo", "商业险单号");
+        writer.addHeaderAlias("insuranceEndDate", "商业险结束时间");
+        writer.addHeaderAlias("strongInsuranceCompany", "交强险公司");
+        writer.addHeaderAlias("strongInsuranceNo", "交强险单号");
+        writer.addHeaderAlias("strongInsuranceEndDate", "交强险时间");
+
 
 
         // 一次性写出内容，使用默认样式，强制输出标题

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

@@ -207,6 +207,9 @@
         v.insurance_no,
         v.insurance_start_date,
         v.insurance_end_date,
+        v.strong_insurance_company,
+        v.strong_insurance_no,
+        v.strong_insurance_end_date,
         v.annual_verification_date,
         v.maintenance_date,
         v.maintenance_mileage,