From 8c132142d0ee8b72372e589c6b1856fbd6e1f21e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 21 一月 2026 17:04:54 +0800
Subject: [PATCH] 仓库列表优化
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java | 49 +------------------------------------------------
1 files changed, 1 insertions(+), 48 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
index 91cd547..b4646fb 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
@@ -3,9 +3,7 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
-import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.Depot;
-import com.fzzy.igds.domain.PledgeContract;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.PledgeContractService;
import com.fzzy.igds.utils.ContextUtil;
@@ -16,7 +14,6 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -43,50 +40,6 @@
public List<Depot> getData(String parentId) {
if (StringUtils.isNotEmpty(parentId)) {
return depotService.getData(null, parentId, false);
- }
- return depotService.getData(null, ContextUtil.subDeptId(null), false);
- }
-
- /**
- * depotPR#getDataByBankId
- *
- * @return
- */
- @DataProvider
- public List<Depot> getDataByBankId(String bankId) {
- if (StringUtils.isNotEmpty(bankId)) {
- //鏌ヨ閾惰瀵瑰簲鐨勭洃绠′粨搴�
- IgdsBaseParam baseParam = new IgdsBaseParam();
- baseParam.setBankId(bankId);
- List<PledgeContract> pledgeContracts = pledgeContractService.listAll(baseParam);
-
- // 鎻愬彇鎵�鏈� PledgeContract 涓� depot_ids 瀛楁鍖呭惈鐨� depot ID
- List<String> validDepotIds = new ArrayList<>();
- for (PledgeContract contract : pledgeContracts) {
- if (StringUtils.isNotEmpty(contract.getDepotIds())) {
- // 灏嗛�楀彿鍒嗛殧鐨� depot_ids 杞崲涓� Set
- String[] ids = contract.getDepotIds().split(",");
- for (String id : ids) {
- if (StringUtils.isNotEmpty(id.trim())) {
- validDepotIds.add(id.trim());
- }
- }
- }
- }
- List<Depot> allData = depotService.getData(null, ContextUtil.subDeptId(null), false);
- if (!validDepotIds.isEmpty()) {
- // 杩囨护鍑哄湪 PledgeContract.depot_ids 涓嚭鐜扮殑 depot
- List<Depot> filteredData = new ArrayList<>();
-
- for (Depot allDatum : allData) {
- if (validDepotIds.contains(allDatum.getId())) {
- filteredData.add(allDatum);
- }
- }
- return filteredData;
- }
- return new ArrayList<>();
-
}
return depotService.getData(null, ContextUtil.subDeptId(null), false);
}
@@ -135,7 +88,7 @@
*/
@DataProvider
public List<Depot> getAllCache() {
- return depotService.getCacheDepotList(null, ContextUtil.subDeptId(null));
+ return depotService.getCacheDepotList(null);
}
/**
--
Gitblit v1.9.3