From 7476521d394eee149f32b0cd788112621f661b70 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 07 十月 2023 20:51:42 +0800
Subject: [PATCH] 1892346
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 db3731d..f252498 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
@@ -17,6 +17,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -40,12 +42,16 @@
private TravelCountService travelCountService;
@GetMapping("/all")
- public AjaxResult listAll(TravelCount travelCount, @JsonFormat(pattern = "yyyy-MM-dd") Date happenStartTime,@JsonFormat(pattern = "yyyy-MM-dd") Date happenEndTime){
+ public AjaxResult listAll(TravelCount travelCount, String happenStartTime, String happenEndTime) throws ParseException {
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,happenStartTime,happenEndTime);
+ 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);
}
@GetMapping("/{id}")
--
Gitblit v1.9.1