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 | 18 ++++++++++++++++--
1 files changed, 16 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 16a3c10..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
@@ -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;
@@ -16,7 +17,10 @@
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;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -38,12 +42,22 @@
private TravelCountService travelCountService;
@GetMapping("/all")
- public AjaxResult listAll(){
+ 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);
+ 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}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return AjaxResult.success(travelCountService.getDataById(id));
}
--
Gitblit v1.9.1