From a69aafe60ce001834b981778f12fd74d4af77e23 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 23 六月 2024 22:04:42 +0800
Subject: [PATCH] 小医生修改&下载分享数据

---
 zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
index 02ec17f..39214ce 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
@@ -36,7 +36,7 @@
     private TravelCountService travelCountService;
 
     @Override
-    public AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize,TravelCount travelCount) {
+    public AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize, TravelCount travelCount, String happenStartTime, String happenEndTime) {
         //璁剧疆鏌ヨ鏉′欢
         LambdaQueryWrapper<TravelCount> lqw = new LambdaQueryWrapper<>();
         lqw.eq(TravelCount::getUid,userId);
@@ -49,8 +49,14 @@
             lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
             lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
         }
+        if(happenStartTime!=null){
+            lqw.gt(TravelCount::getStartTime,happenStartTime);
+        }
 
-
+        if(happenEndTime!=null){
+            lqw.lt(TravelCount::getEndTime,happenEndTime);
+        }
+        lqw.orderByDesc(TravelCount::getCreateTime);
 
         Page<TravelCount> resultPage = page(new Page<>(pageNum, pageSize), lqw);
         resultPage.getRecords().forEach(this::inputTotalData);

--
Gitblit v1.9.1