From 923af8f8eb0d849b92afa8b567036aae2837f202 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期五, 21 四月 2023 16:41:00 +0800
Subject: [PATCH] 888

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index fb803c4..9fef9fc 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -42,36 +42,36 @@
 
     @Resource
     ZfEventService zfEventService;
-    
-    private String listFamilyIds(){
+
+    private String listFamilyIds() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Long userId = user.getUserId();
         LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId,userId);
+        zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId, userId);
         ZInfoUser zInfoUser = zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
         return zInfoUser.getFamilyId();
     }
-    
+
 
     @Override
     public AjaxResult selectEventList(ZfEvent zfEvent, Integer pageNum, Integer pageSize) {
         String familyIds = listFamilyIds();
-        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent,familyIds);
+        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, familyIds);
 
-        Page<ZfEvent> ZfEventPage = new Page<>(pageNum,pageSize);
+        Page<ZfEvent> ZfEventPage = new Page<>(pageNum, pageSize);
         Page<ZfEvent> pageResult = page(ZfEventPage, lqw);
 
         HashMap<String, Object> data = MapUtils.getResult(pageResult);
         return AjaxResult.success(data);
     }
-    
+
 
     @Override
     public List<ZfEvent> selectByCondition(ZfEvent zfEvent) {
         String familyIds = listFamilyIds();
-        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent,familyIds);
+        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, familyIds);
         List<ZfEvent> list = list(lqw);
-        log.info("杩斿洖鐨勬暟鎹负:{}",list);
+        log.info("杩斿洖鐨勬暟鎹负:{}", list);
         return list;
     }
 
@@ -119,11 +119,12 @@
 
     private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent) {
         LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
-        lqw.like(!StringUtils.isEmpty(zfEvent.getAddress()),ZfEvent::getAddress,zfEvent.getAddress());
-        lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()),ZfEvent::getPeople,zfEvent.getPeople());
-        lqw.like(!StringUtils.isEmpty(zfEvent.getTitle()),ZfEvent::getTitle,zfEvent.getTitle());
-        lqw.like(!StringUtils.isEmpty(zfEvent.getRemark()),ZfEvent::getRemark,zfEvent.getRemark());
-        lqw.like(zfEvent.getCreateTime()!=null,ZfEvent::getCreateTime,zfEvent.getCreateTime());
+        lqw.like(!StringUtils.isEmpty(zfEvent.getAddress()), ZfEvent::getAddress, zfEvent.getAddress());
+        lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()), ZfEvent::getPeople, zfEvent.getPeople());
+        lqw.like(!StringUtils.isEmpty(zfEvent.getTitle()), ZfEvent::getTitle, zfEvent.getTitle());
+        lqw.like(!StringUtils.isEmpty(zfEvent.getRemark()), ZfEvent::getRemark, zfEvent.getRemark());
+        lqw.eq(zfEvent.getHappenTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenTime());
+        lqw.between(zfEvent.getHappenStartTime() != null && zfEvent.getHappenEndTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenStartTime(), zfEvent.getHappenEndTime());
         return lqw;
     }
 
@@ -131,9 +132,9 @@
         LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent);
         if (familyIds.contains(",")) {
             String[] familyList = familyIds.split(",");
-            lqw.in(ZfEvent::getFamilyId,familyList);
-        }else {
-            lqw.eq(ZfEvent::getFamilyId,familyIds);
+            lqw.in(ZfEvent::getFamilyId, familyList);
+        } else {
+            lqw.eq(ZfEvent::getFamilyId, familyIds);
         }
         return lqw;
     }

--
Gitblit v1.9.1