From d096e4f9fd6d63f40d0ec27f767be59848197f5b Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 22 五月 2025 18:13:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
index 744750a..ac1167d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* 姘斾綋绠¤矾浜ц兘瑙勫垝Controller
@@ -43,7 +44,7 @@
* 鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃
*/
@Operation(summary = "鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃", description = "鍒嗛〉鏌ヨ")
- @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
+// @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
@GetMapping("/list")
public TableDataInfo list(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) {
// startPage();
@@ -57,11 +58,20 @@
ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlanTemp = new ApsGasPipelineCapacityPlan();
apsGasPipelineCapacityPlanTemp.setProcessName(apsStandardProcessTemp.getProcessName());
apsGasPipelineCapacityPlanTemp.setOrgCode(apsStandardProcessTemp.getPlant());
+ apsGasPipelineCapacityPlanTemp.setWorkshop(apsStandardProcessTemp.getWorkShop());
list.add(apsGasPipelineCapacityPlanTemp);
}
+ } else {
+ list.forEach(item -> {
+ processList.stream().filter(p -> Objects.equals(p.getPlant(), item.getOrgCode()))
+ .filter(p -> Objects.equals(p.getProcessName(), item.getProcessName()))
+ .findFirst().ifPresent(p -> {
+ item.setWorkshop(p.getWorkShop());
+ });
+ });
}
if (processList.size() > list.size()) {
- List<String> newProcess = new ArrayList<>();
+ List<ApsStandardProcess> newProcess = new ArrayList<>();
for (ApsStandardProcess apsStandardProcessTemp : processList) {
boolean flag = true;
for (ApsGasPipelineCapacityPlan temp : list) {
@@ -71,12 +81,14 @@
}
}
if (flag) {
- newProcess.add(apsStandardProcessTemp.getProcessName());
+ newProcess.add(apsStandardProcessTemp);
}
}
- for (String processName : newProcess) {
+ for (ApsStandardProcess processName : newProcess) {
ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlanTemp = new ApsGasPipelineCapacityPlan();
- apsGasPipelineCapacityPlanTemp.setProcessName(processName);
+ apsGasPipelineCapacityPlanTemp.setProcessName(processName.getProcessName());
+ apsGasPipelineCapacityPlanTemp.setOrgCode(processName.getPlant());
+ apsGasPipelineCapacityPlanTemp.setWorkshop(processName.getWorkShop());
list.add(apsGasPipelineCapacityPlanTemp);
}
}
--
Gitblit v1.9.3