From f0b83c0c8b0b5de22ed448cd6d69c607fb8e51aa Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 7 Sep 2021 16:26:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=9A=E8=AE=AE=E6=97=B6=E9=97=B4=E4=BA=A4?=
 =?UTF-8?q?=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingController.java      | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 5516ceee..06fd5bc4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -1,14 +1,13 @@
 package com.jero.meeting.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.jero.common.api.vo.Result;
@@ -76,6 +75,22 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
         QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
+        String meetingStartTime = req.getParameter("meetingStartTime");
+        String meetingEndTime = req.getParameter("meetingEndTime");
+        if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
+            queryWrapper.not(
+                    a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
+            );
+        }else if (ObjectUtil.isNotEmpty(meetingStartTime)){
+            queryWrapper.not(
+                    a -> a.lt("end_time", meetingStartTime)
+            );
+        }else if (ObjectUtil.isNotEmpty(meetingEndTime)){
+            queryWrapper.not(
+                    a -> a.gt("start_time", meetingEndTime)
+            );
+        }
+
         Page<PayMeeting> page = new Page<>(pageNo, pageSize);
         IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
         for (PayMeeting meeting : pageList.getRecords()) {