From 775a9a9d8481dec53834483c3afd5a553e20782e Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 22 Dec 2025 17:23:49 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
index 90e2758..1f3a806 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
@@ -50,10 +50,10 @@
@RequestParam(value = "startTime") String startTime,
@RequestParam(value = "endTime") String endTime,
@RequestParam(value = "discount", required = false) String discount,
- @RequestParam(value = "period") Integer period,
+ @RequestParam(value = "period", required = false) Integer period,
@RequestParam(value = "nowPrice") String nowPrice,
@RequestParam(value = "switchType", defaultValue = "0") Integer switchType) {
- return stockDzService.addByAdmin(stockCode, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.US_STOCKS);
+ return stockDzService.addByAdmin(stockCode, null, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.US_STOCKS, 0);
}
/**
@@ -81,8 +81,10 @@
public Result getDzCheckList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
- @RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_STOCKS);
+ @RequestParam(value = "stockCode", required = false)String stockCode,
+ @RequestParam(value = "userName", required = false)String userName
+ ) {
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_STOCKS, userName,null);
}
@ApiOperation("大宗审核")
@@ -94,7 +96,7 @@
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
- return stockDzService.dzCheck(id, checkType, orderNum);
+ return stockDzService.dzCheck(id, checkType, orderNum, 0);
}
}
--
Gitblit v1.9.3