From deb8a2c32ba0cb7a88819b54d720418cdc2f7ebb Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 24 三月 2026 16:58:53 +0800
Subject: [PATCH] 粮情报表，数量监测报表，库区回显错误纠正
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java | 70 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 42 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 bc1f867..6f994e1 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,12 +3,13 @@
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.common.constant.BizTypeEnum;
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;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -16,7 +17,6 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -48,51 +48,18 @@
}
/**
- *
- * TODO 褰撳墠鏂规硶鍙栨秷锛岄�昏緫璋冩暣涓哄湪鎻愪氦鏃跺�欓獙璇佹槸鍚︽槸閾惰鐩戠浠擄紝榛樿鑾峰彇鐩稿簲鐨勫垪琛�
- * depotPR#getDataByBankId
+ * depotPR#getDepotByUserType
*
* @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<>();
-
+ public List<Depot> getDepotByUserType(String parentId) {
+ if (StringUtils.isNotEmpty(parentId)) {
+ return depotService.getDepotByUserType(parentId);
}
- return depotService.getData(null, ContextUtil.subDeptId(null), false);
+ return depotService.getDepotByUserType(null);
}
-
/**
* depotPR#saveOrUpdate
*
@@ -110,12 +77,31 @@
}
/**
+ * 鏇存柊搴撳瓨淇℃伅
+ * depotPR#saveOrUpdate2
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ @Transactional
+ @Log(title = "搴撳瓨绠＄悊", businessType = BusinessType.UPDATE,bizType = BizTypeEnum.SYS)
+ public String saveOrUpdate2(Depot data) {
+
+ Depot depot = new Depot();
+ BeanUtils.copyProperties(data, depot);
+ depotService.updateStorageReal(depot);
+ return null;
+ }
+
+ /**
* depotPR#deleteDepot
*
* @param data
*/
@Expose
@Transactional
+ @Log(title = "浠撳簱绠＄悊", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SYS)
public void deleteDepot(Depot data) {
Depot depot = new Depot();
BeanUtils.copyProperties(data, depot);
--
Gitblit v1.9.3