From 58a6badee4350ace9693d05d0be31f51e8d1fef1 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 17 Feb 2025 14:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=B7=A5=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BABUG=E4=BF=AE=E5=A4=8D=E3=80=81=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=89=E8=A3=85=E7=8E=AF=E8=8A=82=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=9D=E5=AD=98BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aftersales/mapper/AftersalesAbnormalPackageMapper.xml      | 2 ++
 .../com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml  | 2 +-
 .../service/impl/AftersalesWorkOrderServiceImpl.java           | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml
index 262bbf321..0e7d21d01 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml
@@ -67,6 +67,8 @@
                 </foreach>
             </if>
         </where>
+        group BY
+        ldpl.id
     </select>
     <select id="getTrunklines" resultType="com.logpm.aftersales.vo.AftersalesTrunklineVO">
         SELECT ltcl.cars_line_name vehicleRoute , ltcls.load_code as trainNumber
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 f6f53d721..281332e02 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
@@ -3038,7 +3038,7 @@
         lawo.create_time AS createTime ,
         ( lawo.create_time + INTERVAL 3 DAY ) AS endCreateTime,
         lawo.update_time AS updateTime,
-        GROUP_CONCAT( lapr.result_type ) AS  resultType,
+        GROUP_CONCAT(DISTINCT lapr.result_type ) AS  resultType,
         IFNULL( SUM( lapr.money ), 0 ) AS  money,
         lawo.warehouse_service_name AS warehouseServiceName,
         lawo.headquarters_name AS headquartersName,
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index 542b7b6f9..be9e1c1ba 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -500,6 +500,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				workOrderEntity.setWarehousingTime(aftersalesWorkOrder.getWarehousingTime());
 				break;
 			case "5":
+			case "7":
 				//车次号、配送时间、配送司机、发现时间
 				if (Objects.isNull(aftersalesWorkOrder.getTrainNumber())) {
 					return R.fail("请填写车次信息");
@@ -518,7 +519,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				workOrderEntity.setDeliveryDriver(aftersalesWorkOrder.getDeliveryDriver());
 				workOrderEntity.setDiscoveryTime(aftersalesWorkOrder.getDiscoveryTime());
 				break;
-			case "7":
+
 			case "8":
 				break;
 			default: