From 534c1e3664d37a052e827242193653d6a000309c Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期三, 16 八月 2023 00:41:07 +0800
Subject: [PATCH] 786126
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 12 +++++++++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 2 ++
zhang-content/src/main/java/com/ruoyi/domain/ZRotation.java | 2 ++
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 1 -
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index ff960f0..b9de3a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.zhang;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -27,6 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.websocket.server.PathParam;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.regex.Pattern;
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZRotation.java b/zhang-content/src/main/java/com/ruoyi/domain/ZRotation.java
index 3879410..dd85b4c 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZRotation.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZRotation.java
@@ -25,4 +25,6 @@
private String url;
private Integer flag;
+
+ private Integer choose;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 4c460e2..0650dcd 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -80,7 +80,6 @@
.in(ZfProperty::getFamilyId,familyIdList)
.eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
.between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
-
lqw.orderByDesc(ZfProperty::getCreateTime);
return lqw;
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 1a3606a..b4c060e 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
@@ -329,10 +329,9 @@
ZInfoUser zInfoUser = new ZInfoUser();
BeanUtils.copyProperties(genealogy, zInfoUser);
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
- lqw.eq(zInfoUser.getIdentity() != null, ZInfoUser::getIdentity, zInfoUser.getIdentity());
lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
- lqw.eq(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
+// lqw.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth());
List<ZInfoUser> allPeopleList = list(lqw);
// List<ZInfoUser> allPeopleList = list();
@@ -374,6 +373,9 @@
// )
+// if(genealogy.getIdentity()!=null){
+// result = result.stream().filter(data -> data.getIdentity() == genealogy.getIdentity()).collect(Collectors.toList());
+// }
return AjaxResult.success(result);
@@ -424,24 +426,28 @@
if(genealogy.getIdentity()!=null){
if(data.getIdentity()!=genealogy.getIdentity()){
it.remove();
+ continue;
}
}
if(genealogy.getNickName()!=null){
if(!data.getNickName().contains(genealogy.getNickName())){
it.remove();
+ continue;
}
}
if(genealogy.getSex()!=null){
if(data.getSex()!=genealogy.getSex()){
it.remove();
+ continue;
}
}
if(genealogy.getBirth()!=null){
- if(data.getBirth()!=genealogy.getBirth()){
+ if(data.getBirth().compareTo(genealogy.getBirth())!=0){
it.remove();
+ continue;
}
}
}
--
Gitblit v1.9.1