From 2a4aae6ded633e414913f097ff9f4dd05e43114c Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Fri, 22 Nov 2024 16:44:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E6=9E=97=E6=B0=8F=E5=B7=A5?=
 =?UTF-8?q?=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改回传时修改的状态不正确的问题
---
 .../linsy/service/impl/FactoryNodePushServiceImpl.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/FactoryNodePushServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/FactoryNodePushServiceImpl.java
index 762fde4a3..0c9d78595 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/FactoryNodePushServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/FactoryNodePushServiceImpl.java
@@ -233,6 +233,11 @@ public class FactoryNodePushServiceImpl extends BaseServiceImpl<FactoryNodePushM
 				}
 			}
 			if (CollUtil.isNotEmpty(updateList)) {
+				// id相同时，更新 workedNodeCode 最大的那一条数据
+				updateList = updateList.stream().collect(Collectors.groupingBy(PackageInfoEntity::getId)).values().stream()
+					.map(data -> data.get(data.size() - 1)).collect(Collectors.toList());
+				// 按 workedNodeCode 正序
+				// updateList.sort(Comparator.comparingInt(PackageInfoEntity::getWorkedNodeCode));
 				packageInfoService.updateBatchById(updateList);
 			}
 		}