From 980f15c7957813111d5e506e82edc17e08b9d5a1 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 27 Feb 2024 11:23:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicdataVehicleController.java           |  84 +++---
 .../excel/BasicdataVehicleExcel.java          |  96 +++----
 .../excel/BasicdataVehicleImportExcel.java    | 245 +++++++-----------
 .../mapper/BasicdataVehicleMapper.xml         |  58 ++++-
 .../impl/BasicdataVehicleServiceImpl.java     |  18 +-
 5 files changed, 255 insertions(+), 246 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java
index 3cf4a8629..aabd86583 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java
@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.alibaba.excel.util.DateUtils;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -221,48 +222,49 @@ public class BasicdataVehicleController extends BladeController {
 	public void exportVehicleTemplate(HttpServletResponse response) {
 		List<BasicdataVehicleImportExcel> list = new ArrayList<>();
 		BasicdataVehicleImportExcel basicdataVehicleImportExcel = new BasicdataVehicleImportExcel();
-		basicdataVehicleImportExcel.setVehicleNub("鄂HG40Q9");
-		basicdataVehicleImportExcel.setVehicleSource("1");
-		basicdataVehicleImportExcel.setIsHead("1");
-		basicdataVehicleImportExcel.setTrailerType("1");
-		basicdataVehicleImportExcel.setVehicleModel("1");
-		basicdataVehicleImportExcel.setCarType("1");
-		basicdataVehicleImportExcel.setVehicleCommander(new BigDecimal(70.0));
-		basicdataVehicleImportExcel.setVehicleHeight(new BigDecimal(70.0));
-		basicdataVehicleImportExcel.setApprovedVolume(new BigDecimal(500.0));
-		basicdataVehicleImportExcel.setPaymentMethod("1");
-		basicdataVehicleImportExcel.setLicensePlateColor("1");
-		basicdataVehicleImportExcel.setVehicleCode("代号");
-		basicdataVehicleImportExcel.setVehicleColor("1");
-		basicdataVehicleImportExcel.setLicensePlateType("1");
-		basicdataVehicleImportExcel.setNotes("备注");
-		basicdataVehicleImportExcel.setVehicleOwner("如需绑定司机填写司机名称");
-		basicdataVehicleImportExcel.setVehicleBrand("车辆品牌");
-		basicdataVehicleImportExcel.setEngineCode("B48");
-		basicdataVehicleImportExcel.setVehicleQuality(new BigDecimal(500.0));
-		basicdataVehicleImportExcel.setLoadMass(new BigDecimal(500.0));
-		basicdataVehicleImportExcel.setOuterWidth(new BigDecimal(500.0));
-		basicdataVehicleImportExcel.setExpirationTime(new Date());
-		basicdataVehicleImportExcel.setRoadTransport("420303001532");
-		basicdataVehicleImportExcel.setBusinessLicense("420303001532");
-		basicdataVehicleImportExcel.setVehicleUnit("个人");
-		basicdataVehicleImportExcel.setVehicleUnitPhone("15678923467");
-		basicdataVehicleImportExcel.setVehicleOwnerPhone("如需绑定司机填写司机手机号码");
-		basicdataVehicleImportExcel.setVehicleOwnerCard("车辆所属人身份证号");
-		basicdataVehicleImportExcel.setCarrierName("汇通运输");
-		basicdataVehicleImportExcel.setReviewTime(new Date());
-		basicdataVehicleImportExcel.setReviewValidity(24);
-		basicdataVehicleImportExcel.setInsuranceStartTime(new Date());
-		basicdataVehicleImportExcel.setInsuranceEndTime(new Date());
-		basicdataVehicleImportExcel.setBodyAdvertising("有");
-		basicdataVehicleImportExcel.setBodyAdvertising("有");
-		basicdataVehicleImportExcel.setAdvertisementsNewTimes(new Date());
-		basicdataVehicleImportExcel.setVehicleParkingCompany("XXX挂靠公司");
-		basicdataVehicleImportExcel.setWithGps("1");
-		basicdataVehicleImportExcel.setGpsServiceProvider("XXX服务商");
-		basicdataVehicleImportExcel.setGpsModel("VT77M");
-		basicdataVehicleImportExcel.setDemonstrate("是");
+//		basicdataVehicleImportExcel.setVehicleNub("鄂HG40Q9");
+//		basicdataVehicleImportExcel.setVehicleSource("1");
+//		basicdataVehicleImportExcel.setIsHead("1");
+//		basicdataVehicleImportExcel.setTrailerType("1");
+//		basicdataVehicleImportExcel.setVehicleModel("1");
+//		basicdataVehicleImportExcel.setCarType("1");
+//		basicdataVehicleImportExcel.setVehicleCommander(new BigDecimal(70.0));
+//		basicdataVehicleImportExcel.setVehicleHeight(new BigDecimal(70.0));
+//		basicdataVehicleImportExcel.setApprovedVolume(new BigDecimal(500.0));
+//		basicdataVehicleImportExcel.setPaymentMethod("1");
+//		basicdataVehicleImportExcel.setLicensePlateColor("1");
+//		basicdataVehicleImportExcel.setVehicleCode("代号");
+//		basicdataVehicleImportExcel.setVehicleColor("1");
+//		basicdataVehicleImportExcel.setLicensePlateType("1");
+//		basicdataVehicleImportExcel.setNotes("备注");
+//		basicdataVehicleImportExcel.setVehicleOwner("如需绑定司机填写司机名称");
+//		basicdataVehicleImportExcel.setVehicleBrand("车辆品牌");
+//		basicdataVehicleImportExcel.setEngineCode("B48");
+//		basicdataVehicleImportExcel.setVehicleQuality(new BigDecimal(500.0));
+//		basicdataVehicleImportExcel.setLoadMass(new BigDecimal(500.0));
+//		basicdataVehicleImportExcel.setOuterWidth(new BigDecimal(500.0));
+//		basicdataVehicleImportExcel.setExpirationTime(DateUtils.format(new Date(),"dd/MM/yyyy"));
+//		basicdataVehicleImportExcel.setInsuranceStartTime(DateUtils.format(new Date(),"dd/MM/yyyy"));
+//		basicdataVehicleImportExcel.setInsuranceEndTime(DateUtils.format(new Date(),"dd/MM/yyyy"));
+//		basicdataVehicleImportExcel.setAdvertisementsNewTimes(DateUtils.format(new Date(),"dd/MM/yyyy"));
+//		basicdataVehicleImportExcel.setReviewTime(DateUtils.format(new Date(),"dd/MM/yyyy"));
+//		basicdataVehicleImportExcel.setRoadTransport("420303001532");
+//		basicdataVehicleImportExcel.setBusinessLicense("420303001532");
+//		basicdataVehicleImportExcel.setVehicleUnit("个人");
+//		basicdataVehicleImportExcel.setVehicleUnitPhone("15678923467");
+//		basicdataVehicleImportExcel.setVehicleOwnerPhone("如需绑定司机填写司机手机号码");
+//		basicdataVehicleImportExcel.setVehicleOwnerCard("车辆所属人身份证号");
+//		basicdataVehicleImportExcel.setCarrierName("汇通运输");
+//		basicdataVehicleImportExcel.setReviewValidity(24);
+//		basicdataVehicleImportExcel.setBodyAdvertising("有");
+//		basicdataVehicleImportExcel.setBodyAdvertising("有");
+//		basicdataVehicleImportExcel.setVehicleParkingCompany("XXX挂靠公司");
+//		basicdataVehicleImportExcel.setWithGps("1");
+//		basicdataVehicleImportExcel.setGpsServiceProvider("XXX服务商");
+//		basicdataVehicleImportExcel.setGpsModel("VT77M");
+//		basicdataVehicleImportExcel.setDemonstrate("是");
 		list.add(basicdataVehicleImportExcel);
+
 		ExcelUtil.export(response, "车辆信息表数据" + DateUtil.time(), "车辆信息表数据表", list, BasicdataVehicleImportExcel.class);
 	}
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleExcel.java
index 4ea6f7ba4..fc3287e1d 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleExcel.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleExcel.java
@@ -42,18 +42,18 @@ public class BasicdataVehicleExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
-	/**
-	 * 是否已删除;1-未删除，2-已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除;1-未删除，2-已删除")
-	private Integer isDeleted;
+//	/**
+//	 * 租户号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("租户号")
+//	private String tenantId;
+//	/**
+//	 * 是否已删除;1-未删除，2-已删除
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("是否已删除;1-未删除，2-已删除")
+//	private Integer isDeleted;
 	/**
 	 * 车牌号
 	 */
@@ -282,12 +282,18 @@ public class BasicdataVehicleExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("保险卡照片")
 	private String insuranceCardPhoto;
+//	/**
+//	 * 关联承运商Id
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("关联承运商Id")
+//	private String carrierId;
 	/**
-	 * 关联承运商Id
+	 * 关联承运商名称
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("关联承运商Id")
-	private String carrierId;
+	@ExcelProperty("关联承运商名称")
+	private String carrierName;
 	/**
 	 * 车辆年审时间
 	 */
@@ -348,35 +354,35 @@ public class BasicdataVehicleExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("GPS型号")
 	private String gpsModel;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+//	/**
+//	 * 预留1
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预留1")
+//	private String reserve1;
+//	/**
+//	 * 预留2
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预留2")
+//	private String reserve2;
+//	/**
+//	 * 预留3
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预留3")
+//	private String reserve3;
+//	/**
+//	 * 预留4
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预留4")
+//	private String reserve4;
+//	/**
+//	 * 预留5
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预留5")
+//	private String reserve5;
 
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java
index 63a3f78cd..b265105ed 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleImportExcel.java
@@ -17,6 +17,7 @@
 package com.logpm.basicdata.excel;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -46,99 +47,130 @@ public class BasicdataVehicleImportExcel implements Serializable {
 	/**
 	 * 车牌号
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车牌号")
+	@ColumnWidth(45)
+	@ExcelProperty(index = 0,value = "车牌号,必填项:{示例:川A12345}")
 	private String vehicleNub;
 	/**
 	 * 车辆来源;1-自有,2-承包,3-外请
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆来源;1-自有,2-承包,3-外请")
+	@ColumnWidth(45)
+	@ExcelProperty(index = 1,value ="车辆来源;1-自有,2-承包,3-外请")
 	private String vehicleSource;
 	/**
 	 * 是否车头;1-车头,2-挂车
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否车头;1-车头,2-挂车")
+	@ColumnWidth(35)
+	@ExcelProperty(index = 2,value ="是否车头;1-车头,2-挂车")
 	private String isHead;
 	/**
 	 * 挂车类型;1-独享,2-共享
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("挂车类型;1-独享,2-共享")
+	@ColumnWidth(32)
+	@ExcelProperty(index = 3,value ="挂车类型;1-独享,2-共享")
 	private String trailerType;
 	/**
 	 * 车辆类型;1-挂车,2-普通货车
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆类型;1-挂车,2-普通货车")
+	@ColumnWidth(150)
+	@ExcelProperty(index = 4,value ="车辆类型;1-厢式货车;2-箱式挂车;3-平板货车;4-平板挂车;5-高栏车;6-高栏挂车;7-城配面包车;8-城配金杯车")
 	private String vehicleModel;
 	/**
 	 * 车厢类型;1-高栏,2-平板,3-箱车
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车厢类型;1-高栏,2-平板,3-箱车")
+	@ColumnWidth(45)
+	@ExcelProperty(index = 5,value ="车厢类型;1-高栏,2-平板,3-箱车")
 	private String carType;
 	/**
 	 * 车长;单位（M）
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("车长;单位（M）")
+	@ExcelProperty(index = 6,value ="车长;单位（M）")
 	private BigDecimal vehicleCommander;
 	/**
 	 * 外廓高
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("外廓高")
+	@ExcelProperty(index = 7,value ="外廓高")
 	private BigDecimal vehicleHeight;
-	/**
-	 * 付款方式;1-现付,2-月付,3-到付
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("付款方式;1-现付,2-月付,3-到付")
-	private String paymentMethod;
-	/**
-	 * 核定体积
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("核定体积")
-	private BigDecimal approvedVolume;
 	/**
 	 * 车牌颜色;1-黄色,2-蓝色,3-绿色,4-蓝绿色,5-其他
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(60)
 	@ExcelProperty("车牌颜色;1-黄色,2-蓝色,3-绿色,4-蓝绿色,5-其他")
 	private String licensePlateColor;
 	/**
 	 * 车身颜色;1-红,2-黄,3-蓝,4-黑,5-白,6-银
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(55)
 	@ExcelProperty("车身颜色;1-红,2-黄,3-蓝,4-黑,5-白,6-银")
 	private String vehicleColor;
 	/**
 	 * 能源类型;1-汽油,2-柴油,3-电,4-天然气,5-混合油,6-燃化石油气,7-甲醇
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(90)
 	@ExcelProperty("能源类型;1-汽油,2-柴油,3-电,4-天然气,5-混合油,6-燃化石油气,7-甲醇")
 	private String energyType;
 	/**
 	 * 车牌类型;1-大型汽车号牌,2-小型汽车号牌
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(50)
 	@ExcelProperty("车牌类型;1-大型汽车号牌,2-小型汽车号牌")
 	private String licensePlateType;
 	/**
-	 * 备注
+	 * 车辆总质量;单位（T）
+	 */
+	@ColumnWidth(30)
+	@ExcelProperty("车辆总质量;单位（T）")
+	private BigDecimal vehicleQuality;
+	/**
+	 * 整备质量;单位（T）
+	 */
+	@ColumnWidth(30)
+	@ExcelProperty("整备质量;单位（T）")
+	private BigDecimal curbWeight;
+	/**
+	 * 载荷质量;单位（T）
+	 */
+	@ColumnWidth(30)
+	@ExcelProperty("载荷质量;单位（T）")
+	private BigDecimal loadMass;
+	/**
+	 * 外廓宽;单位（M）
+	 */
+	@ColumnWidth(30)
+	@ExcelProperty("外廓宽;单位（M）")
+	private BigDecimal outerWidth;
+	/**
+	 * 核定体积
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("备注")
-	private String notes;
+	@ExcelProperty("核定体积")
+	private BigDecimal approvedVolume;
+	/**
+	 * 付款方式;1-现付,2-月付,3-到付
+	 */
+	@ColumnWidth(45)
+	@ExcelProperty(index = 8,value ="付款方式;1-现付,2-月付,3-到付")
+	private String paymentMethod;
+
 	/**
 	 * 车辆所属人
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆所属人")
+	@ColumnWidth(100)
+	@ExcelProperty("车辆所属人:{示例:张三(绑定司机需先建立司机,司机名称与手机号码保持一致)}")
 	private String vehicleOwner;
+	/**
+	 * 车辆所属人手机号
+	 */
+	@ColumnWidth(100)
+	@ExcelProperty(value = "车辆所属人手机号:{示例:156xxxxxxxxx(绑定司机需与司机手机号一致)}")
+	private String vehicleOwnerPhone;
+	/**
+	 * 车辆所属人身份证号
+	 */
+	@ColumnWidth(65)
+	@ExcelProperty("车辆所属人身份证号::{示例:510100xxxxxxxxxxxx}")
+	private String vehicleOwnerCard;
 	/**
 	 * 品牌型号
 	 */
@@ -157,36 +189,13 @@ public class BasicdataVehicleImportExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("发动机型号")
 	private String engineCode;
-	/**
-	 * 车辆总质量;单位（T）
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆总质量;单位（T）")
-	private BigDecimal vehicleQuality;
-	/**
-	 * 整备质量;单位（T）
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("整备质量;单位（T）")
-	private BigDecimal curbWeight;
-	/**
-	 * 载荷质量;单位（T）
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("载荷质量;单位（T）")
-	private BigDecimal loadMass;
-	/**
-	 * 外廓宽;单位（M）
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("外廓宽;单位（M）")
-	private BigDecimal outerWidth;
+
 	/**
 	 * 到期时间
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("到期时间")
-	private Date expirationTime;
+	@ColumnWidth(38)
+	@ExcelProperty(value = "到期时间:{示例:2023/2/28}")
+	private String expirationTime;
 	/**
 	 * 道路运输证号
 	 */
@@ -202,94 +211,36 @@ public class BasicdataVehicleImportExcel implements Serializable {
 	/**
 	 * 车辆所属单位
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆所属单位")
+	@ColumnWidth(40)
+	@ExcelProperty(value = "车辆所属单位")
 	private String vehicleUnit;
 	/**
 	 * 车辆所属单位电话
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆所属单位电话")
+	@ColumnWidth(55)
+	@ExcelProperty(value = "车辆所属单位电话:{示例:156xxxxxxxxx}")
 	private String vehicleUnitPhone;
-	/**
-	 * 车辆所属人手机号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆所属人手机号")
-	private String vehicleOwnerPhone;
-	/**
-	 * 车辆所属人身份证号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆所属人身份证号")
-	private String vehicleOwnerCard;
-//	/**
-//	 * 行驶证正面照片
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("行驶证正面照片")
-//	private String drivingLicensePhoto;
-//	/**
-//	 * 行驶证照片反面
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("行驶证照片反面")
-//	private String drivingLicensePhotoBack;
-//	/**
-//	 * 许可证照片
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("许可证照片")
-//	private String licensePhoto;
-//	/**
-//	 * 车辆照片(最新)
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("车辆照片(最新)")
-//	private String vehiclePhoto;
-//	/**
-//	 * 车尾照片
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("车尾照片")
-//	private String vehicleRearPhoto;
-//	/**
-//	 * 道路运输照片
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("道路运输照片")
-//	private String roadTransportPhoto;
-//	/**
-//	 * 人车合影照片
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("人车合影照片")
-//	private String vehiclePeoplePhoto;
-//	/**
-//	 * 保险卡照片
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("保险卡照片")
-//	private String insuranceCardPhoto;
+
 	/**
 	 * 关联承运商Id
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("关联承运商Id")
+	@ExcelIgnore
 	private Long carrierId;
 
 	/**
 	 * 关联承运商Id
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(50)
 	@ExcelProperty("承运商名称")
 	private String carrierName;
 	/**
 	 * 车辆年审时间
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆年审时间")
-	private Date reviewTime;
+	@ColumnWidth(50)
+	@ExcelProperty("车辆年审时间:{示例:2023/2/28}")
+	private String reviewTime;
 	/**
 	 * 车辆年审有效期
 	 */
@@ -299,15 +250,15 @@ public class BasicdataVehicleImportExcel implements Serializable {
 	/**
 	 * 车辆保险开始时间
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆保险开始时间")
-	private Date insuranceStartTime;
+	@ColumnWidth(50)
+	@ExcelProperty("车辆保险开始时间:{示例:2023/2/28}")
+	private String insuranceStartTime;
 	/**
 	 * 车辆保险结束时间
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆保险结束时间")
-	private Date insuranceEndTime;
+	@ColumnWidth(50)
+	@ExcelProperty("车辆保险结束时间:{示例:2023/2/28}")
+	private String insuranceEndTime;
 	/**
 	 * 有无车身广告
 	 */
@@ -317,19 +268,13 @@ public class BasicdataVehicleImportExcel implements Serializable {
 	/**
 	 * 车身广告跟新时间
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车身广告跟新时间")
-	private Date advertisementsNewTimes;
-	/**
-	 * 车辆挂靠公司
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆挂靠公司")
-	private String vehicleParkingCompany;
+	@ColumnWidth(50)
+	@ExcelProperty("车身广告更新时间:{示例:2023/2/28}")
+	private String advertisementsNewTimes;
 	/**
 	 * 是否有GPS;1-没有,2-有
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(35)
 	@ExcelProperty("是否有GPS;1-没有,2-有")
 	private String withGps;
 	/**
@@ -345,11 +290,11 @@ public class BasicdataVehicleImportExcel implements Serializable {
 	@ExcelProperty("GPS型号")
 	private String gpsModel;
 	/**
-	 * 是否是示例
+	 * 备注
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否示例")
-	private String demonstrate;
+	@ColumnWidth(100)
+	@ExcelProperty("备注")
+	private String notes;
 
 
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml
index f184a0133..9cf648ff0 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml
@@ -159,7 +159,61 @@
 
 
     <select id="exportBasicdataVehicle" resultType="com.logpm.basicdata.excel.BasicdataVehicleExcel">
-        SELECT * FROM logpm_basicdata_vehicle
+        SELECT
+        lbc.vehicle_nub AS vehicleNub,
+        lbc.vehicle_source AS vehicleSource,
+        lbc.is_head AS isHead,
+        lbc.trailer_type AS trailerType,
+        lbc.vehicle_model AS vehicleModel,
+        lbc.car_type AS carType,
+        lbc.vehicle_commander AS vehicleCommander,
+        lbc.vehicle_height AS vehicleHeight,
+        lbc.payment_method AS paymentMethod,
+        lbc.approved_volume AS approvedVolume,
+        lbc.license_plate_color AS licensePlateColor,
+        lbc.vehicle_color AS vehicleColor,
+        lbc.energy_type AS energyType,
+        lbc.license_plate_type AS licensePlateType,
+        lbc.notes AS notes,
+        GROUP_CONCAT(DISTINCT lbda.name) AS vehicleOwner,
+        lbc.vehicle_brand ASvehicleBrand,
+        lbc.vehicle_code AS vehicleCode,
+        lbc.engine_code AS engineCode,
+        lbc.vehicle_quality AS vehicleQuality,
+        lbc.curb_weight AS curbWeight,
+        lbc.load_mass AS loadMass,
+        lbc.outer_width AS outerWidth,
+        lbc.expiration_time AS expirationTime,
+        lbc.road_transport AS roadTransport,
+        lbc.business_license AS businessLicense,
+        lbc.vehicle_unit AS vehicleUnit,
+        lbc.vehicle_unit_phone AS vehicleUnitPhone,
+        GROUP_CONCAT(DISTINCT lbda.phone) AS vehicleOwnerPhone,
+        lbc.vehicle_owner_card AS vehicleOwnerCard,
+        lbc.driving_license_photo,
+        lbc.driving_license_photo_back,
+        lbc.license_photo,
+        lbc.vehicle_photo,
+        lbc.vehicle_rear_photo,
+        lbc.road_transport_photo,
+        lbc.vehicle_people_photo,
+        lbc.insurance_card_photo,
+        lbc.carrier_id,
+        lbc.review_time AS reviewTime,
+        lbc.review_validity AS reviewValidity,
+        lbc.insurance_start_time AS insuranceStartTime,
+        lbc.insurance_end_time AS insuranceEndTime,
+        lbc.body_advertising AS bodyAdvertising,
+        lbc.advertisements_new_times AS advertisementsNewTimes,
+        lbc.vehicle_parking_company AS vehicleParkingCompany,
+        lbc.with_gps AS withGps,
+        lbc.gps_service_provider AS gpsServiceProvider,
+        lbc.gps_model AS gpsModel,
+        lbc.carrier_name AS carrierName
+        FROM
+        logpm_basicdata_vehicle AS lbc
+        LEFT JOIN logpm_basicdata_drivermiddle AS lbd ON lbc.id = lbd.brand_id
+        LEFT JOIN logpm_basicdata_driver_artery AS lbda  ON lbd.driver_id = lbda.id
         <where>
             is_deleted = 0
             <if test="ids != null and ids != ''">
@@ -169,6 +223,8 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY
+        lbc.id
     </select>
     <select id="selectPhotoBymasterId" resultType="java.lang.String">
         SELECT
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java
index 94df329ff..322a2d6cd 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java
@@ -176,12 +176,12 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 				if (Func.isNotEmpty(entity)){
 					continue;
 				}
-				if (Func.isNotBlank(datum.getDemonstrate())){
-					//查询是否是模板示例
-					if ("是".equals(datum.getDemonstrate())){
-						continue;
-					}
-				}
+//				if (Func.isNotBlank(datum.getDemonstrate())){
+//					//查询是否是模板示例
+//					if ("是".equals(datum.getDemonstrate())){
+//						continue;
+//					}
+//				}
 
 				//查询模板信息是否合法
 				//车牌号是否合法
@@ -203,7 +203,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 					//查询是否存在司机
 					if (!StringUtil.isBlank(datum.getVehicleOwner())){
 						BasicdataDriverArteryEntity driverArteryEntity = basicdataDriverArteryMapper.findDriverListByPhone(datum.getVehicleOwner().trim(),datum.getVehicleOwnerPhone().trim());
-						if (!BeanUtil.isEmpty(driverArteryEntity)) {
+						if (BeanUtil.isEmpty(driverArteryEntity)) {
 							log.info(method+ "查询到司机信息，进行绑定！>>>:{}",driverArteryEntity.getName());
 							log.info(method+ "查询到司机信息，进行绑定！>>>:{}",driverArteryEntity.getPhone());
 							//绑定用户
@@ -234,8 +234,8 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 
 				BasicdataVehicleEntity vehicleEntity = Func.copy(datum, BasicdataVehicleEntity.class);
 				vehicleEntity.setCarrierId(datum.getCarrierId().toString());
-				vehicleEntity.setInsuranceStartTime(datum.getInsuranceStartTime() == null ? null : DateUtil.format(datum.getInsuranceStartTime(), "yyyy-MM-dd"));
-				vehicleEntity.setInsuranceEndTime(datum.getInsuranceEndTime() == null ? null : DateUtil.format(datum.getInsuranceEndTime(), "yyyy-MM-dd"));
+				vehicleEntity.setInsuranceStartTime(datum.getInsuranceStartTime());
+				vehicleEntity.setInsuranceEndTime(datum.getInsuranceEndTime());
 				this.save(vehicleEntity);
 				if (Func.isNotEmpty(basicdataDrivermiddleEntity)){
 					basicdataDrivermiddleEntity.setBrandId(vehicleEntity.getId());