From 63240c3b7edb2a149511fdbe4108755ad60db91f Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 19 十一月 2024 15:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java | 17 +++++++++++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 4 ++--
zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java | 1 +
zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java | 15 +++++++++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 16 ++++++++++++++++
6 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 095b1b3..b6e5d53 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -5,8 +5,10 @@
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;
+import org.apache.ibatis.type.JdbcType;
import java.io.Serializable;
+import java.sql.Timestamp;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -249,6 +251,20 @@
@TableField(exist = false)
private List<ZInfoUser> childList;
+ /**
+ * 寮�濮嬫椂闂� 鐢熸棩
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+ private Date happenStartTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+ private Date happenEndTime;
+
}
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 bd669b7..1ac6075 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
@@ -106,6 +106,9 @@
*/
private String url;
+ /**
+ * 鏃堕棿
+ */
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date happenStartTime;
@@ -114,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/domain/dto/Genealogy.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
index 94d2f3a..c1346f5 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
@@ -1,8 +1,10 @@
package com.ruoyi.domain.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
import java.io.Serializable;
import java.util.Date;
@@ -54,4 +56,19 @@
private Genealogy spouse;
+ /**
+ * 寮�濮嬫椂闂� 鐢熸棩
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+ private Date happenStartTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+ private Date happenEndTime;
+
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java
index 4f1b7c8..cb508d6 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java
@@ -136,4 +136,4 @@
Map<Long,List<Long>> menuAconId = getByUserId(userId).stream().collect(Collectors.groupingBy(ZfShare::getSysMenuId,Collectors.mapping(ZfShare::getShareContent,Collectors.toList())));
return AjaxResult.success(all(menuAconId));
}
-}
+}
\ No newline at end of file
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index 1a38cd6..40ef5ab 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -170,7 +170,7 @@
lqw.like(StringUtils.isNotEmpty(zInfoUser.getUnit()), ZInfoUser::getUnit, zInfoUser.getUnit());
lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus());
- lqw.le(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
+ lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
return lqw;
@@ -595,7 +595,7 @@
}
}
- if(genealogy.getBirth()!=null&&data.getBirth()!=null){
+ if(genealogy.getBirth()!=null){
if(data.getBirth().compareTo(genealogy.getBirth())!=0){
it.remove();
continue;
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 baa26ae..978a08e 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
@@ -66,6 +66,7 @@
.le(zSecret.getValidityDate()!=null, ZSecret::getValidityDate, zSecret.getValidityDate())
.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