From bc0fdd1f0c20ca4737e8f073050f37b27a658694 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 16:31:12 +0800
Subject: [PATCH] 管路&气柜产能负载优化，实现动态row聚合统计
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
index 88aa68c..5ba719e 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsProcessRouteController.java
@@ -14,10 +14,12 @@
import com.aps.core.service.IApsProcessRouteTempService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
+import java.util.Map;
/**
* 宸ヨ壓璺嚎Controller
@@ -39,9 +41,9 @@
*/
@RequiresPermissions("processRoute:processRoute:list")
@GetMapping("/list")
- public TableDataInfo list(ApsProcessRoute apsProcessRoute)
+ public TableDataInfo list(ApsProcessRoute apsProcessRoute, Pageable pageable)
{
-// startPage();
+ startPage();
List<ApsProcessRoute> list = apsProcessRouteService.selectApsProcessRouteList(apsProcessRoute);
return getDataTable(list);
}
@@ -105,6 +107,7 @@
/**
* 宸ヨ壓璺嚎瀵煎叆
*/
+ @RequiresPermissions("processRoute:processRoute:importData")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<ApsProcessRouteTemp> util = new ExcelUtil<ApsProcessRouteTemp>(ApsProcessRouteTemp.class);
@@ -132,9 +135,20 @@
* @Author: wwj
* @Date: 2025/4/9
*/
+ @RequiresPermissions("processRoute:processRoute:confirmProcessRoute")
@PostMapping("/confirmProcessRoute")
public AjaxResult confirmProcessRoute(@RequestBody ApsProcessRouteTemp apsProcessRouteTemp) {
return toAjax(apsProcessRouteService.confirmProcessRoute(apsProcessRouteTemp));
}
+ /**
+ * 鑾峰彇宸ュ簭鍒楄〃锛堝幓閲嶏級
+ * @return
+ */
+ @PostMapping("/selectProcessNameList")
+ public TableDataInfo selectProcessNameList(@RequestBody Map<String, String> params) {
+ return getDataTable(apsProcessRouteService.selectProcessNameList(params.get("orgCode")));
+ }
+
+
}
--
Gitblit v1.9.3