From 2514b4bc99726361d993f6f5ecd2a438c9ed1f1f Mon Sep 17 00:00:00 2001
From: ydj <yangsink@163.com>
Date: Mon, 08 Jul 2024 13:53:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
index f0bb75e..cc11dbf 100644
--- a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
@@ -68,9 +68,9 @@
if (type != null && !type.equals("")) {
queryWrapper.eq("type", type);
}
- if(getType == 1){
- queryWrapper.gt("list_date", new Date());
- }
+// if(getType == 1){
+// queryWrapper.gt("list_date", new Date());
+// }
if(stockType != null){
queryWrapper.eq("stock_type", stockType);
}
@@ -79,6 +79,17 @@
// queryWrapper.select(StockSubscribe.class, info -> !info.getColumn().equals("password"));
// }
List<StockSubscribe> stockSubscribeList = this.stockSubscribeMapper.selectList(queryWrapper);
+
+ Date newDate = new Date();
+
+ for (StockSubscribe stockSubscribe : stockSubscribeList) {
+ Date startDate = stockSubscribe.getSubscribeTime();
+ Date endDate = stockSubscribe.getSubscriptionTime();
+
+ boolean isBetween = newDate.after(startDate) && newDate.before(endDate);
+ stockSubscribe.setIsBetween(isBetween);
+ }
+
PageInfo pageInfo = new PageInfo(stockSubscribeList);
pageInfo.setList(stockSubscribeList);
--
Gitblit v1.9.3