From 8e18ec88057e37b90e76a5ecf03e91f089781626 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 07 十月 2023 20:44:10 +0800
Subject: [PATCH] 123
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java | 6 ++++--
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java | 11 ++++++++++-
zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java | 4 +++-
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java
index 24681cf..db3731d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.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.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -17,6 +18,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -38,12 +40,12 @@
private TravelCountService travelCountService;
@GetMapping("/all")
- public AjaxResult listAll(TravelCount travelCount){
+ public AjaxResult listAll(TravelCount travelCount, @JsonFormat(pattern = "yyyy-MM-dd") Date happenStartTime,@JsonFormat(pattern = "yyyy-MM-dd") Date happenEndTime){
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- return travelCountService.selectDataList(userId,pageNum,pageSize,travelCount);
+ return travelCountService.selectDataList(userId,pageNum,pageSize,travelCount,happenStartTime,happenEndTime);
}
@GetMapping("/{id}")
diff --git a/zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java b/zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java
index b3cfc55..96f540b 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java
@@ -2,9 +2,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.TravelCount;
+import java.util.Date;
import java.util.List;
/**
@@ -17,7 +19,7 @@
*/
public interface TravelCountService extends IService<TravelCount> {
- AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize,TravelCount travelCount);
+ AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize, TravelCount travelCount, @JsonFormat(pattern = "yyyy-MM-dd") Date happenStartTime, @JsonFormat(pattern = "yyyy-MM-dd") Date happenEndTime);
void removeData(List<Long> list);
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..3907ded 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.domain.TravelCount;
@@ -16,6 +17,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.DecimalFormat;
+import java.util.Date;
import java.util.List;
/**
@@ -36,7 +38,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, @JsonFormat(pattern = "yyyy-MM-dd") Date happenStartTime, @JsonFormat(pattern = "yyyy-MM-dd") Date happenEndTime) {
//璁剧疆鏌ヨ鏉′欢
LambdaQueryWrapper<TravelCount> lqw = new LambdaQueryWrapper<>();
lqw.eq(TravelCount::getUid,userId);
@@ -49,6 +51,13 @@
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);
+ }
--
Gitblit v1.9.1