From 583f0b0df83876e68e8729d9872f83af08b8ae27 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 08 十二月 2023 10:35:06 +0800
Subject: [PATCH] 部门使用人重复显示修改
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 8ba6b3d..160179e 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -6,6 +6,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -430,41 +431,39 @@
}
List<GoodsUseRecordVO> goodsUseRecordList = Lists.newArrayList();
// 鍒嗙粍
- Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream().collect(
- Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId)));
- // 寮�濮嬪惊鐜痗ollect
- for (Map.Entry<Long, Map<Long, List<UseRecordDTO>>> entry : collect.entrySet()) {
+ Map<Long, List<UseRecordDTO>> groupedRecords =
+ useRecordDTOList.stream().collect(Collectors.groupingBy(UseRecordDTO::getId));
+ for (Entry<Long, List<UseRecordDTO>> entry : groupedRecords.entrySet()) {
Long id = entry.getKey();
- Map<Long, List<UseRecordDTO>> value = entry.getValue();
+ List<UseRecordDTO> useRecordList = entry.getValue();
+ UseRecordDTO useRecordDto = useRecordList.get(0);
// 寮�濮嬪惊鐜痸alue
+ GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
+ goodsUseRecordVO.setId(id);
+ goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
+ goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());
List<UseRecordSkuVO> useRecordSkuList = Lists.newArrayList();
- for (Map.Entry<Long, List<UseRecordDTO>> item : value.entrySet()) {
- List<UseRecordDTO> list = item.getValue();
- List<RecordUserInfoVO> recordUserInfoList = Lists.newArrayList();
- for (UseRecordDTO useRecordDto : list) {
-
- GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
- goodsUseRecordVO.setId(id);
- goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
- goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());
-
+ useRecordList.stream().collect(Collectors.groupingBy(UseRecordDTO::getProcureModelId))
+ .forEach((key, recordList) -> {
+ UseRecordDTO useRecordDTO = recordList.get(0);
UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
- useRecordSkuVO.setBaseGoodModelId(useRecordDto.getBaseGoodsModelsId());
- useRecordSkuVO.setBaseGoodModelName(useRecordDto.getBaseGoodsModelsName());
- useRecordSkuVO.setUnit(useRecordDto.getUnit());
- useRecordSkuVO.setProcureModelId(useRecordDto.getProcureModelId());
-
- RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
- recordUserInfoVO.setUseName(useRecordDto.getUseName());
- recordUserInfoVO.setPhone(useRecordDto.getPhone());
- recordUserInfoVO.setNum(useRecordDto.getNum());
- recordUserInfoList.add(recordUserInfoVO);
+ useRecordSkuVO.setBaseGoodModelId(useRecordDTO.getBaseGoodsModelsId());
+ useRecordSkuVO.setBaseGoodModelName(useRecordDTO.getBaseGoodsModelsName());
+ useRecordSkuVO.setUnit(useRecordDTO.getUnit());
+ useRecordSkuVO.setProcureModelId(useRecordDTO.getProcureModelId());
+ List<RecordUserInfoVO> recordUserInfoList = Lists.newArrayList();
+ for (UseRecordDTO userInfo : recordList) {
+ RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
+ recordUserInfoVO.setUseName(userInfo.getUseName());
+ recordUserInfoVO.setPhone(userInfo.getPhone());
+ recordUserInfoVO.setNum(userInfo.getNum());
+ recordUserInfoList.add(recordUserInfoVO);
+ }
useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
useRecordSkuList.add(useRecordSkuVO);
- goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
- goodsUseRecordList.add(goodsUseRecordVO);
- }
- }
+ });
+ goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
+ goodsUseRecordList.add(goodsUseRecordVO);
}
// 鍒嗙粍涔嬪悗閲嶆柊鎺掑簭
List<GoodsUseRecordVO> result = goodsUseRecordList
--
Gitblit v1.9.1