From 1618c08a4e384150a5b21671a3ee75f8c0250d3f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 19 十一月 2024 20:21:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java | 1 +
zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
index 14bfbf6..1ac6075 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
@@ -117,6 +117,18 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date happenEndTime;
+
+ /**
+ * 鏈熼檺
+ */
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date vHappenStartTime;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date vHappenEndTime;
+
/**
* 鍒嗕韩浜�
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
index bc79f8d..9e1f257 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
@@ -65,6 +65,7 @@
.eq(zSecret.getIsPrivate()!=null,ZSecret::getIsPrivate,zSecret.getIsPrivate())
.eq(zSecret.getIsFace()!=null,ZSecret::getIsFace,zSecret.getIsFace())
.between(zSecret.getHappenStartTime() != null && zSecret.getHappenEndTime() != null, ZSecret::getHappenTime, zSecret.getHappenStartTime(), zSecret.getHappenEndTime())
+ .between(zSecret.getVHappenStartTime() != null && zSecret.getVHappenEndTime() != null, ZSecret::getValidityDate, zSecret.getVHappenStartTime(), zSecret.getVHappenEndTime())
.orderByDesc(ZSecret::getCreateTime);
return lqw;
}
--
Gitblit v1.9.1