From 57f7ec8d2842dd9ec250639e3c8f5c066cc7d30c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 09 十月 2023 07:55:15 +0800
Subject: [PATCH] 删除了某些代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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..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;
@@ -17,6 +18,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,11 +43,15 @@
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);
}
--
Gitblit v1.9.1