From 9d7ad46fe98534d5fb835b7dbd48d0460ca319ef Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 07 十月 2023 20:58:51 +0800
Subject: [PATCH] 187234
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java | 9 +++++----
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java | 4 +---
zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java | 2 +-
3 files changed, 7 insertions(+), 8 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 f252498..fd94d83 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
@@ -9,6 +9,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.TravelCount;
import com.ruoyi.service.TravelCountService;
@@ -47,11 +48,11 @@
Long userId = user.getUserId();
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
- Date start = simpleDateFormat.parse(happenStartTime);
- Date end = simpleDateFormat.parse(happenEndTime);
- return travelCountService.selectDataList(userId,pageNum,pageSize,travelCount,start,end);
+
+
+
+ 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 96f540b..fa91351 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java
@@ -19,7 +19,7 @@
*/
public interface TravelCountService extends IService<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);
+ AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize, TravelCount travelCount, String happenStartTime, String 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 3907ded..fa3cbc6 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
@@ -38,7 +38,7 @@
private TravelCountService travelCountService;
@Override
- 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) {
+ 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);
@@ -58,8 +58,6 @@
if(happenEndTime!=null){
lqw.lt(TravelCount::getEndTime,happenEndTime);
}
-
-
Page<TravelCount> resultPage = page(new Page<>(pageNum, pageSize), lqw);
resultPage.getRecords().forEach(this::inputTotalData);
--
Gitblit v1.9.1