From 1c3eaff1c9b0f7b021ac0750a65b8bd1f880ec54 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 19 十一月 2024 20:25:12 +0800
Subject: [PATCH] 修改
---
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, 0 insertions(+), 13 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 1ac6075..14bfbf6 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
@@ -117,18 +117,6 @@
@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 9e1f257..bc79f8d 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,7 +65,6 @@
.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