From cd3e490b95b7e6130c506b47debc5ca004bc01f2 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 23 五月 2025 15:36:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 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 ac1167d..0b08b15 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
@@ -10,8 +10,10 @@
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.ApsGasPipelineCapacityPlan;
+import com.aps.core.domain.ApsShop;
import com.aps.core.domain.ApsStandardProcess;
import com.aps.core.service.IApsGasPipelineCapacityPlanService;
+import com.aps.core.service.IApsShopService;
import com.aps.core.service.IApsStandardProcessService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.Objects;
@@ -40,6 +43,9 @@
@Autowired
private IApsStandardProcessService apsStandardProcessService;
+ @Autowired
+ private IApsShopService apsShopService;
+
/**
* 鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃
*/
@@ -53,20 +59,30 @@
apsStandardProcess.setMajor(apsGasPipelineCapacityPlan.getMajor());
apsStandardProcess.setPlant(apsGasPipelineCapacityPlan.getOrgCode());
List<ApsStandardProcess> processList = apsStandardProcessService.selectApsStandardProcessListAll(apsStandardProcess);
+ List<ApsShop> apsShops = apsShopService.findShopByFactory(apsGasPipelineCapacityPlan.getOrgCode());
if (list.isEmpty()) {
for (ApsStandardProcess apsStandardProcessTemp : processList) {
ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlanTemp = new ApsGasPipelineCapacityPlan();
apsGasPipelineCapacityPlanTemp.setProcessName(apsStandardProcessTemp.getProcessName());
apsGasPipelineCapacityPlanTemp.setOrgCode(apsStandardProcessTemp.getPlant());
- apsGasPipelineCapacityPlanTemp.setWorkshop(apsStandardProcessTemp.getWorkShop());
+ apsGasPipelineCapacityPlanTemp.setWorkshop(apsShops.stream()
+ .filter(shop -> Objects.equals(shop.getShopName(), apsStandardProcessTemp.getWorkShop()))
+ .map(ApsShop::getShopCode)
+ .findFirst()
+ .orElse(null));
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()))
+ list.forEach(capacityPlan -> {
+ processList.stream().filter(p -> Objects.equals(p.getPlant(), capacityPlan.getOrgCode()))
+ .filter(p -> Objects.equals(p.getMajor(), capacityPlan.getMajor()))
+ .filter(p -> p.getWorkShop() != null)
.findFirst().ifPresent(p -> {
- item.setWorkshop(p.getWorkShop());
+ capacityPlan.setWorkshop(apsShops.stream()
+ .filter(shop -> Objects.equals(shop.getShopCode(), p.getWorkShop()))
+ .map(ApsShop::getShopName)
+ .findFirst()
+ .orElse(null));
});
});
}
@@ -84,15 +100,19 @@
newProcess.add(apsStandardProcessTemp);
}
}
- for (ApsStandardProcess processName : newProcess) {
+ for (ApsStandardProcess process : newProcess) {
ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlanTemp = new ApsGasPipelineCapacityPlan();
- apsGasPipelineCapacityPlanTemp.setProcessName(processName.getProcessName());
- apsGasPipelineCapacityPlanTemp.setOrgCode(processName.getPlant());
- apsGasPipelineCapacityPlanTemp.setWorkshop(processName.getWorkShop());
+ apsGasPipelineCapacityPlanTemp.setProcessName(process.getProcessName());
+ apsGasPipelineCapacityPlanTemp.setOrgCode(process.getPlant());
+ apsGasPipelineCapacityPlanTemp.setWorkshop(apsShops.stream()
+ .filter(shop -> Objects.equals(shop.getShopName(), process.getWorkShop()))
+ .map(ApsShop::getShopCode)
+ .findFirst()
+ .orElse(null));
list.add(apsGasPipelineCapacityPlanTemp);
}
}
- list.sort((a, b) -> a.getProcessName().compareTo(b.getProcessName()));
+ list.sort(Comparator.comparing(ApsGasPipelineCapacityPlan::getProcessName));
return getDataTable(list);
}
--
Gitblit v1.9.3