From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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..d728150 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
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.domain.TravelCount;
import com.ruoyi.domain.TravelDetail;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.TravelCountMapper;
import com.ruoyi.service.TravelCountService;
import com.ruoyi.service.TravelDetailService;
@@ -38,7 +39,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 +59,7 @@
if(happenEndTime!=null){
lqw.lt(TravelCount::getEndTime,happenEndTime);
}
-
-
+ lqw.orderByDesc(TravelCount::getCreateTime);
Page<TravelCount> resultPage = page(new Page<>(pageNum, pageSize), lqw);
resultPage.getRecords().forEach(this::inputTotalData);
--
Gitblit v1.9.1