From bf0fede48bb6064d5d0bcc6b13d53c1352722a57 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 7 Feb 2025 11:19:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=89=B9=E9=87=8F=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TrunklineAdvanceServiceImpl.java  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
index bab6b7217..24a37763c 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
@@ -776,10 +776,22 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		//提取出advanceDetailEntities所有元素的advanceId存入Set
 		Set<Long> advanceIdSet = advanceDetailEntities.stream().map(TrunklineAdvanceDetailEntity::getAdvanceId).collect(Collectors.toSet());
 		List<TrunklineAdvanceEntity> advanceEntityList = findListByIds(new ArrayList<>(advanceIdSet));
+		//把advanceEntityList以orderCode为key的Map，如果value是多个只取第一个
+
+
 
 		Map<String, TrunklineAdvanceEntity> advanceEntityMap = new HashMap<>();
 		if (!advanceEntityList.isEmpty()) {
-			advanceEntityMap = advanceEntityList.stream().collect(Collectors.toMap(TrunklineAdvanceEntity::getOrderCode, Function.identity()));
+			//把advanceEntityList以orderCode进行分组
+//			Map<String, List<TrunklineAdvanceEntity>> groupedByOrderCode = advanceEntityList.stream()
+//				.collect(Collectors.groupingBy(TrunklineAdvanceEntity::getOrderCode));
+//			advanceEntityMap = advanceEntityList.stream().collect(Collectors.toMap(TrunklineAdvanceEntity::getOrderCode, Function.identity()));
+			advanceEntityMap = advanceEntityList.stream()
+				.collect(Collectors.toMap(
+					TrunklineAdvanceEntity::getOrderCode,
+					entity -> entity,
+					(existing, replacement) -> existing // 只保留第一个
+				));
 		}