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 | 12 ++++++++++-- 1 files changed, 10 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..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,18 @@ private TravelCountService travelCountService; @GetMapping("/all") - public AjaxResult listAll(){ + 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); + return travelCountService.selectDataList(userId,pageNum,pageSize,travelCount,happenStartTime,happenEndTime); + } + + @GetMapping("/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(travelCountService.getDataById(id)); } -- Gitblit v1.9.1