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 | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 a7ec0d8..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
@@ -5,11 +5,14 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.service.DepotService;
+import com.fzzy.igds.service.PledgeContractService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+
import javax.annotation.Resource;
import java.util.List;
@@ -25,17 +28,25 @@
@Resource
private DepotService depotService;
+ @Resource
+ private PledgeContractService pledgeContractService;
+
/**
* depotPR#getData
+ *
* @return
*/
@DataProvider
- public List<Depot> getData(){
- return depotService.getData(null, ContextUtil.subDeptId(null) ,false);
+ 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#saveOrUpdate
+ *
* @param data
* @return
*/
@@ -51,11 +62,12 @@
/**
* depotPR#deleteDepot
+ *
* @param data
*/
@Expose
@Transactional
- public void deleteDepot(Depot data) {
+ public void deleteDepot(Depot data) {
Depot depot = new Depot();
BeanUtils.copyProperties(data, depot);
depotService.deleteDepot(depot);
@@ -71,15 +83,17 @@
/**
* ${dorado.getDataProvider("depotPR#getAllCache").getResult()}
+ *
* @return
*/
@DataProvider
public List<Depot> getAllCache() {
- return depotService.getCacheDepotList(null, ContextUtil.subDeptId(null));
+ return depotService.getCacheDepotList(null);
}
/**
* depotPR#ajaxGetAllCache
+ *
* @return
*/
@Expose
@@ -88,6 +102,16 @@
}
/**
+ * depotPR#getDataByCompanyId
+ *
+ * @return
+ */
+ @DataProvider
+ public List<Depot> getDataByCompanyId() {
+ return depotService.getData(null, null, false);
+ }
+
+ /**
* depotPR#getDepot 鑾峰彇浠撳簱淇℃伅
*
* @param depotId
--
Gitblit v1.9.3