From 4368795d5b268e460d312ab4f05074e633ad3dae Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Tue, 30 May 2023 16:56:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E5=8E=86=E5=8F=B2=E7=85=A7=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/BasicdataVehicleEntity.java        | 50 +++++++++----------
 .../BasicdataVehicleController.java           |  2 +
 .../mapper/BasicdataVehicleMapper.xml         |  4 +-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java
index 439e5b5ab..437d87919 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java
@@ -282,30 +282,30 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "GPS型号")
 	private String gpsModel;
-//	/**
-//	 * 预留1
-//	 */
-//	@ApiModelProperty(value = "预留1")
-//	private String reserve1;
-//	/**
-//	 * 预留2
-//	 */
-//	@ApiModelProperty(value = "预留2")
-//	private String reserve2;
-//	/**
-//	 * 预留3
-//	 */
-//	@ApiModelProperty(value = "预留3")
-//	private String reserve3;
-//	/**
-//	 * 预留4
-//	 */
-//	@ApiModelProperty(value = "预留4")
-//	private String reserve4;
-//	/**
-//	 * 预留5
-//	 */
-//	@ApiModelProperty(value = "预留5")
-//	private String reserve5;
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
 
 }
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 01cca302b..0a48c4276 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
@@ -29,6 +29,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -81,6 +82,7 @@ public class BasicdataVehicleController extends BladeController {
 		BasicdataVehicleVO basicdataVehicleVO = new BasicdataVehicleVO();
 		BeanUtils.copyProperties(detail,basicdataVehicleVO);
 		List<String> urls =basicdataVehicleService.selectPhotoBymasterId(basicdataVehicleVO.getId());
+		log.info("urls>>>>>{}",urls);
 		if (urls.size()>0){basicdataVehicleVO.setHistoricPhotos(StringUtils.join(urls, ","));}
 		return R.data(basicdataVehicleVO);
 	}
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 62dfd402d..0d408f0e8 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
@@ -131,7 +131,7 @@
         lbv.gps_model gpsModel,
         (
         SELECT
-        lbvp.photo_url
+        group_concat(lbvp.photo_url)
         FROM
         logpm_basicdata_vehicle_photo lbvp
         where
@@ -139,7 +139,7 @@
         AND lbvp.create_time &lt;= DATE_SUB( CURDATE(), INTERVAL 1 YEAR )
         ORDER BY
         lbvp.create_time
-        LIMIT 1
+        LIMIT 3
         ) historicPhotos
         FROM
         logpm_basicdata_vehicle lbv