From 3e35ad36f09a37de6df6a59b71d6df2346dcb916 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Mon, 16 Oct 2023 22:53:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/BasicdataVehicleEntity.java        |  4 ++++
 .../com/logpm/warehouse/vo/QuestDetailVO.java | 22 +++++++++++++++++--
 .../warehouse/mapper/TaskQuestMapper.xml      |  5 ++++-
 3 files changed, 28 insertions(+), 3 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 c2420d220..91d120e0c 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
@@ -17,6 +17,7 @@
 package com.logpm.basicdata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -163,6 +164,7 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	 * 到期时间
 	 */
 	@ApiModelProperty(value = "到期时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	private Date expirationTime;
 	/**
 	 * 道路运输证号
@@ -243,6 +245,7 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	 * 车辆年审时间
 	 */
 	@ApiModelProperty(value = "车辆年审时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	private Date reviewTime;
 	/**
 	 * 车辆年审有效期
@@ -268,6 +271,7 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	 * 车身广告跟新时间
 	 */
 	@ApiModelProperty(value = "车身广告跟新时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	private Date advertisementsNewTimes;
 	/**
 	 * 车辆挂靠公司
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java
index 286f690ac..e4ba66770 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java
@@ -18,6 +18,7 @@ package com.logpm.warehouse.vo;
 
 import com.logpm.warehouse.entity.QuestDetailChildEntity;
 import com.logpm.warehouse.entity.QuestDetailEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -36,11 +37,28 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class QuestDetailVO extends QuestDetailEntity {
 	private static final long serialVersionUID = 1L;
-	//包件状态
 	/**
 	 * 盘点明细子表List
 	 */
-	private List<QuestDetailChildEntity> list;
+	private List<QuestDetailChildEntity> list =new ArrayList<>();
+
+	/**
+	 * 服务号
+	 */
+	@ApiModelProperty(value = "服务号")
+	private String serviceNumber;
+
+	/**
+	 * 物料名称
+	 */
+	@ApiModelProperty(value = "物料名称")
+	private String descriptionGoods;
+
+	/**
+	 * 商场名称
+	 */
+	@ApiModelProperty(value = "商场名称")
+	private String marketName;
 
 
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
index b70003474..58e6b488c 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
@@ -158,7 +158,10 @@
     </select>
     <select id="selectInventoryListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
         SELECT
-            lqd.*,
+        lqd.*,
+        ldsl.service_number serviceNumber,
+        ldsl.description_goods descriptionGoods,
+        ldsl.market_name marketName,
         (select lqdc.id id from logpm_quest_detail_child lqdc where lqd.id = lqdc.quest_detail_id and lqdc.is_deleted =0) list
         FROM
             logpm_quest_detail lqd