From c14c78fd025e21d5f2cadb520e7f7f8467cc2871 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 13 May 2024 22:48:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=B2=A1=E6=9C=89=E5=93=81=E7=B1=BB=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/AftersalesWorkOrderMapper.xml           | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index a1671ff64..48dab7273 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -57,11 +57,12 @@
         lawo.work_order_type,
         lawo.discovery_node,
         lawo.work_order_number,
-        lawo.waybill_number,
+        laap.waybill_number,
         lawo.order_code,
         lawo.train_number,
-        lawo.FIRST,
-        lawo.secondary,
+        GROUP_CONCAT(laap.`first` separator ',') as `first`,
+        GROUP_CONCAT(laap.secondary separator ',') as secondary,
+        group_concat( DISTINCT laap.brand_name SEPARATOR ',' ) AS brandName,
         lawo.vehicle_route,
         lawo.deliver_goods_time,
         lawo.discovery_time,
@@ -84,7 +85,6 @@
         lawo.process_number,
         lawo.customer_service_name customerServiceName,
         lawo.warehouse_id warehouseId,
-        lawo.brand_name brandName,
         lawo.customer_service_id customerServiceId
         FROM
         logpm_aftersales_work_order lawo
@@ -93,6 +93,7 @@
         AND lap.conditions IN ( 1, 2 )
         LEFT JOIN logpm_aftersales_completion_record lacr ON lacr.work_order_id = lawo.id
         AND lacr.is_deleted = '0'
+        left join logpm_aftersales_abnormal_package laap on lawo.id = laap.work_order_id
         <where>
             lawo.is_deleted = 0
             <if test="param.workOrderStatusNameS != null and param.workOrderStatusNameS != '' ">and  lawo.work_order_status = #{param.workOrderStatusNameS } </if>
@@ -156,9 +157,10 @@
             <if test="param.vehicleRoute != null and param.vehicleRoute != '' ">and  lawo.vehicle_route like concat('%',  #{param.vehicleRoute },'%') </if>
             <if test="param.workOrderStatus != null and param.workOrderStatus != '' and param.handleStatus != 40 "> and  lawo.work_order_status in ( #{param.workOrderStatus }) </if>
             <if test="param.customerServiceState!= null and param.customerServiceState == 80 ">and lawo.work_order_status in ('10') </if>
-            ORDER BY lawo.create_time DESC
-        </where>
 
+        </where>
+        group by lawo.id
+        ORDER BY lawo.create_time DESC
     </select>
     <update id="updateList">
       <foreach collection="list" separator=";" close="" index="index" item="item" open="">