From 606936121e239ff2bee3ca9a4a9ef92e8e7dd094 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 19:28:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
index 8d4953e..3e10b96 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
@@ -20,8 +20,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -45,10 +47,18 @@
public PageInfo<TFrameWarehousingDetailVO> detailList(TWarehousingDetailQuery query) {
PageInfo<TFrameWarehousingDetailVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TFrameWarehousingDetailVO> list = frameWarehousingDetailMapper.pageList(query,pageInfo);
+ List<Integer> storeIds = list.stream().map(TFrameWarehousingDetailVO::getStoreId).collect(Collectors.toList());
+ List<TStore> stores = new ArrayList<>();
+ if(CollectionUtils.isNotEmpty(storeIds)){
+ stores = storeMapper.selectList(Wrappers.lambdaQuery(TStore.class)
+ .in(TStore::getId,storeIds));
+ }
for (TFrameWarehousingDetailVO tFrameWarehousingDetailVO : list) {
- TStore tStore = storeMapper.selectById(tFrameWarehousingDetailVO.getStoreId());
- if(Objects.nonNull(tStore)){
- tFrameWarehousingDetailVO.setStoreName(tStore.getName());
+ if(CollectionUtils.isNotEmpty(stores)){
+ TStore store = stores.stream().filter(tStore -> tStore.getId().equals(tFrameWarehousingDetailVO.getStoreId())).findFirst().orElse(null);
+ if(Objects.nonNull(store)){
+ tFrameWarehousingDetailVO.setStoreName(store.getName());
+ }
}
}
pageInfo.setRecords(list);
@@ -58,17 +68,23 @@
public PageInfo<TLensWarehousingDetailVO> detailListLens(TWarehousingDetailLensQuery query) {
PageInfo<TLensWarehousingDetailVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TLensWarehousingDetailVO> list = lensWarehousingDetailMapper.pageLensList(query,pageInfo);
- for (TLensWarehousingDetailVO tFrameWarehousingDetailVO : list) {
- TStore tStore = storeMapper.selectById(tFrameWarehousingDetailVO.getStoreId());
- if(Objects.nonNull(tStore)){
- tFrameWarehousingDetailVO.setStoreName(tStore.getName());
+ List<Integer> storeIds = list.stream().map(TLensWarehousingDetailVO::getStoreId).collect(Collectors.toList());
+ List<TStore> stores = new ArrayList<>();
+ if(CollectionUtils.isNotEmpty(storeIds)){
+ stores = storeMapper.selectList(Wrappers.lambdaQuery(TStore.class)
+ .in(TStore::getId,storeIds));
+ }
+ for (TLensWarehousingDetailVO tLensWarehousingDetailVO : list) {
+ if(CollectionUtils.isNotEmpty(stores)){
+ TStore store = stores.stream().filter(tStore -> tStore.getId().equals(tLensWarehousingDetailVO.getStoreId())).findFirst().orElse(null);
+ if(Objects.nonNull(store)){
+ tLensWarehousingDetailVO.setStoreName(store.getName());
+ }
}
}
pageInfo.setRecords(list);
return pageInfo;
}
-
-
@Override
public PageInfo<TWarehousingVO> inventoryReceiptList(TWarehousingDetailQuery query) {
--
Gitblit v1.7.1