From 89ae6955743632ed65c97290af0df8b67849b153 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 19 十一月 2024 20:36:36 +0800
Subject: [PATCH] 修改家谱日期
---
zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java | 13 -------------
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 7 +------
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 13 -------------
3 files changed, 1 insertions(+), 32 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 b6e5d53..442efe1 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -251,19 +251,6 @@
@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/dto/Genealogy.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
index c1346f5..61ffddc 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
@@ -56,19 +56,6 @@
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/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index e8d1f8d..fad5ced 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
@@ -624,12 +624,7 @@
continue;
}
}
- if(genealogy.getHappenEndTime() != null && genealogy.getHappenStartTime() != null ){
- if (data.getBirth() == null) {it.remove(); continue;}
- if(data.getBirth().before(genealogy.getHappenStartTime()) || data.getBirth().after(genealogy.getHappenEndTime())){
- it.remove();
- }
- }
+
}
// System.out.println(resultData);
--
Gitblit v1.9.1