From 088e8db2bc8f0869bdc2494864992e756eb0e461 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期六, 24 二月 2024 11:35:17 +0800 Subject: [PATCH] 修改了上传接口 --- zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java | 2 ++ zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java | 2 ++ zhang-content/src/main/java/com/ruoyi/domain/ZTravelPriceDetail.java | 2 ++ zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java | 2 ++ zhang-content/src/main/java/com/ruoyi/domain/ZTravelPrice.java | 2 ++ 5 files changed, 10 insertions(+), 0 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java b/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java index 706d8c7..f135cf3 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java @@ -99,6 +99,8 @@ */ private Double totalPrice; + private String spee; + /** * 鍒涘缓鏃堕棿 */ diff --git a/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java b/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java index bafe54e..e2c01fc 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java @@ -106,5 +106,7 @@ */ private String document; + private Double otherCost; + private String backInfo; } diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZTravelPrice.java b/zhang-content/src/main/java/com/ruoyi/domain/ZTravelPrice.java index 6975b4b..8d9e0bd 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZTravelPrice.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZTravelPrice.java @@ -101,6 +101,8 @@ */ private Long myId; + + /** * 璧峰鏃堕棿鎼滅储浼犲叆 */ diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZTravelPriceDetail.java b/zhang-content/src/main/java/com/ruoyi/domain/ZTravelPriceDetail.java index ae10573..09d7d08 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZTravelPriceDetail.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZTravelPriceDetail.java @@ -68,6 +68,8 @@ private Double totalCost; + + /** * 娑堣垂鏃ユ湡 */ 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 fa3cbc6..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; @@ -58,6 +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