From 8958f7001fefe2fa72f8c7fef0268eab304bd9d8 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 16 三月 2026 10:33:42 +0800
Subject: [PATCH] 质量管理：优化更新数据
---
src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 83 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
index 23f3587..026fa22 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
@@ -25,9 +25,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@@ -90,8 +88,12 @@
.eq(RawMaterialQualityInspectItem::getRawMaterialId, id));
Map<Long, RawMaterialQualityInspectItem> map = rawQualityList.stream().collect(Collectors.toMap(RawMaterialQualityInspectItem::getQualityInspectItemId, qualityInspectItem -> qualityInspectItem));
// 鑾峰彇妫�楠岄」鐩�
- List<QualityInspectItem> qualityInspectItems = qualityInspectItemMapper.selectList(new LambdaQueryWrapper<QualityInspectItem>()
- .in(QualityInspectItem::getId, rawQualityList.stream().map(RawMaterialQualityInspectItem::getQualityInspectItemId).collect(Collectors.toList())));
+ List<QualityInspectItem> qualityInspectItems = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(rawQualityList)) {
+ List<Long> qualityInspectItemIds = rawQualityList.stream().map(RawMaterialQualityInspectItem::getQualityInspectItemId).collect(Collectors.toList());
+ qualityInspectItems = qualityInspectItemMapper.selectList(new LambdaQueryWrapper<QualityInspectItem>()
+ .in(QualityInspectItem::getId, qualityInspectItemIds));
+ }
// 鏇挎崲鍖栭獙鍊�
qualityInspectItems.forEach(qualityInspectItem -> {
qualityInspectItem.setTestValue(map.get(qualityInspectItem.getId()).getTestValue());
@@ -128,24 +130,82 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean update(RawMaterialDto rawMaterialDto) {
- // 鍒犻櫎鎵�鏈夊叧鑱旈」鐩噸鏂板姞杞�
- rawMaterialQualityInspectItemService.remove(new LambdaQueryWrapper<RawMaterialQualityInspectItem>()
- .eq(RawMaterialQualityInspectItem::getRawMaterialId, rawMaterialDto.getId()));
- int i = rawMaterialMapper.updateById(rawMaterialDto);
- // 鏂板妫�娴嬮」鍏宠仈鍏崇郴
- if (CollectionUtils.isNotEmpty(rawMaterialDto.getQualityInspectItem())) {
- List<RawMaterialQualityInspectItem> rawMaterialQualityInspectItems = rawMaterialDto.getQualityInspectItem().stream()
- .map(qualityInspectItem -> {
- RawMaterialQualityInspectItem item = new RawMaterialQualityInspectItem();
- item.setRawMaterialId(rawMaterialDto.getId());
- item.setQualityInspectItemId(qualityInspectItem.getId());
- item.setTestValue(qualityInspectItem.getTestValue());
- return item;
- })
- .collect(Collectors.toList());
- rawMaterialQualityInspectItemService.saveBatch(rawMaterialQualityInspectItems);
+ // 鏇存柊鍘熸枡
+ if (rawMaterialMapper.updateById(rawMaterialDto) <= 0) {
+ return false;
}
- return i > 0;
+
+ Long rawMaterialId = rawMaterialDto.getId();
+ List<QualityInspectItem> newQualityInspectItems = rawMaterialDto.getQualityInspectItem();
+
+ // 鑾峰彇鐜版湁妫�楠岄」鍏宠仈璁板綍
+ List<RawMaterialQualityInspectItem> existingItems = rawMaterialQualityInspectItemService.list(
+ new LambdaQueryWrapper<RawMaterialQualityInspectItem>()
+ .eq(RawMaterialQualityInspectItem::getRawMaterialId, rawMaterialId)
+ );
+
+ // 鍒犻櫎涓嶅瓨鍦ㄧ殑鍏宠仈璁板綍
+ if (CollectionUtils.isEmpty(newQualityInspectItems)) {
+ // 濡傛灉娌℃湁妫�楠岄」锛屽垹闄ゆ墍鏈夌幇鏈夊叧鑱旇褰�
+ if (CollectionUtils.isNotEmpty(existingItems)) {
+ List<Long> existingIds = existingItems.stream()
+ .map(RawMaterialQualityInspectItem::getId)
+ .collect(Collectors.toList());
+ rawMaterialQualityInspectItemService.removeByIds(existingIds);
+ }
+ return true;
+ }
+
+ // 鑾峰彇鏂版楠岄」鐨処D闆嗗悎鍜屾祴璇曞�兼槧灏�
+ Set<Long> newItemIds = newQualityInspectItems.stream()
+ .map(QualityInspectItem::getId)
+ .collect(Collectors.toSet());
+
+ Map<Long, String> testValueMap = newQualityInspectItems.stream()
+ .collect(Collectors.toMap(QualityInspectItem::getId, QualityInspectItem::getTestValue));
+
+ // 鍒犻櫎涓嶅瓨鍦ㄧ殑鍏宠仈璁板綍
+ List<Long> toDelete = existingItems.stream()
+ .filter(item -> !newItemIds.contains(item.getQualityInspectItemId()))
+ .map(RawMaterialQualityInspectItem::getId)
+ .collect(Collectors.toList());
+
+ if (CollectionUtils.isNotEmpty(toDelete)) {
+ rawMaterialQualityInspectItemService.removeByIds(toDelete);
+ }
+
+ // 澶勭悊鏇存柊鏁版嵁
+ List<RawMaterialQualityInspectItem> toUpdate = existingItems.stream()
+ .filter(item -> newItemIds.contains(item.getQualityInspectItemId()))
+ .peek(item -> item.setTestValue(testValueMap.get(item.getQualityInspectItemId())))
+ .collect(Collectors.toList());
+
+ if (CollectionUtils.isNotEmpty(toUpdate)) {
+ rawMaterialQualityInspectItemService.updateBatchById(toUpdate);
+ }
+
+ // 澶勭悊鏂板鏁版嵁
+ Set<Long> existingItemIds = existingItems.stream()
+ .map(RawMaterialQualityInspectItem::getQualityInspectItemId)
+ .collect(Collectors.toSet());
+
+ List<RawMaterialQualityInspectItem> toCreate = newQualityInspectItems.stream()
+ .filter(item -> !existingItemIds.contains(item.getId()))
+ .map(item -> {
+ RawMaterialQualityInspectItem newItem = new RawMaterialQualityInspectItem();
+ newItem.setRawMaterialId(rawMaterialId);
+ newItem.setQualityInspectItemId(item.getId());
+ newItem.setTestValue(item.getTestValue());
+ return newItem;
+ })
+ .collect(Collectors.toList());
+
+ if (CollectionUtils.isNotEmpty(toCreate)) {
+ rawMaterialQualityInspectItemService.saveBatch(toCreate);
+ }
+
+ return true;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3