From 6da289fff756eaecc600422d77c4afff1ddebab0 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 15:23:50 +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 | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 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 fae1314..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,7 +22,9 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
+import java.util.Objects;
/**
* 姘斾綋绠¤矾浜ц兘瑙勫垝Controller
@@ -39,11 +43,14 @@
@Autowired
private IApsStandardProcessService apsStandardProcessService;
+ @Autowired
+ private IApsShopService apsShopService;
+
/**
* 鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃
*/
@Operation(summary = "鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝鍒楄〃", description = "鍒嗛〉鏌ヨ")
- @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
+// @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
@GetMapping("/list")
public TableDataInfo list(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) {
// startPage();
@@ -52,16 +59,35 @@
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(apsShops.stream()
+ .filter(shop -> Objects.equals(shop.getShopName(), apsStandardProcessTemp.getWorkShop()))
+ .map(ApsShop::getShopCode)
+ .findFirst()
+ .orElse(null));
list.add(apsGasPipelineCapacityPlanTemp);
}
+ } else {
+ 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 -> {
+ capacityPlan.setWorkshop(apsShops.stream()
+ .filter(shop -> Objects.equals(shop.getShopCode(), p.getWorkShop()))
+ .map(ApsShop::getShopName)
+ .findFirst()
+ .orElse(null));
+ });
+ });
}
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,16 +97,22 @@
}
}
if (flag) {
- newProcess.add(apsStandardProcessTemp.getProcessName());
+ newProcess.add(apsStandardProcessTemp);
}
}
- for (String processName : newProcess) {
+ for (ApsStandardProcess process : newProcess) {
ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlanTemp = new ApsGasPipelineCapacityPlan();
- apsGasPipelineCapacityPlanTemp.setProcessName(processName);
+ 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);
}
@@ -109,11 +141,12 @@
// 鏍煎紡锛歽yyy-MM
@RequestParam String date,
@RequestParam String factory,
+ @RequestParam String major,
// 鏍煎紡锛歽yyy-MM
@RequestParam String toStart,
// 鏍煎紡锛歽yyy-MM
@RequestParam String toEnd) {
- apsGasPipelineCapacityPlanService.copyPlan(date, factory, toStart, toEnd);
+ apsGasPipelineCapacityPlanService.copyPlan(date, factory, major, toStart, toEnd);
return success();
}
--
Gitblit v1.9.3