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/ApsProcessRouteController.java | 16 ++++++++++++++--
1 files changed, 14 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 989f858..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);
}
@@ -139,4 +141,14 @@
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