From cd8df4afe77d1ea07c87f66714349ae0a699e67e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 18 Oct 2024 14:13:23 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java b/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
index cb145a3..cbb0089 100644
--- a/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
+++ b/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
@@ -42,8 +42,9 @@
                                @RequestParam(value = "zt", required = false) Integer zt,
                                @RequestParam(value = "isLock", required = false) Integer isLock,
                                @RequestParam(value = "type", required = false) Integer type,
+                               @RequestParam(value = "stockType", required = false) Integer stockType,
                                HttpServletRequest request) {
-        return this.iStockSubscribeService.list(name,code,zt,0,isLock,type,request);
+        return this.iStockSubscribeService.list(name,code,zt,0,isLock,type,stockType,1,request);
     }
     /** 
     * @Description:  新增新股
@@ -88,8 +89,14 @@
     //申购信息列表查询
     @RequestMapping({"getStockSubscribeList.do"})
     @ResponseBody
-    public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "12") int pageSize, @RequestParam(value = "keyword", defaultValue = "") String keyword, HttpServletRequest request) {
-        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword, request);
+    public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "12") int pageSize,
+                                                @RequestParam(value = "keyword", defaultValue = "") String keyword,
+                                                @RequestParam(value = "agentId", required = false) String agentId,
+                                                @RequestParam(value = "name", required = false) String name,
+                                                @RequestParam(value = "status", required = false) Integer status,
+                                                HttpServletRequest request) {
+        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId,name,status, request);
     }
 
 

--
Gitblit v1.9.3