From ec4733f0c90a88f2266731d16c94e6e2fada7528 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 22:46:45 +0800
Subject: [PATCH] 修改

---
 zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 02ec17f..d2a16a8 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
@@ -36,7 +36,7 @@
     private TravelCountService travelCountService;
 
     @Override
-    public AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize,TravelCount travelCount) {
+    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);
@@ -49,8 +49,14 @@
             lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
             lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
         }
+        if(happenStartTime!=null){
+            lqw.gt(TravelCount::getStartTime,happenStartTime);
+        }
 
-
+        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);
@@ -85,20 +91,21 @@
         double eatTotal = 0;
         double stayTotal = 0;
         double travelTotal = 0;
-
+        double shopTotal = 0;
         //鎶婃墍鏈夎缁嗘暟鎹殑璐圭敤鍊肩疮鍔犺捣鏉�
         for (TravelDetail detail : travelDetailList) {
             entranceTotal+=detail.getEntrance();
             eatTotal+=detail.getEat();
             stayTotal+=detail.getStay();
             travelTotal+=detail.getTravel();
+            shopTotal += detail.getShop();
         }
 
         travelCount.setEntranceTotal(entranceTotal);
         travelCount.setEatTotal(eatTotal);
         travelCount.setStayTotal(stayTotal);
         travelCount.setTravelTotal(travelTotal);
-
+        travelCount.setShopTotal(shopTotal);
         DecimalFormat df = new DecimalFormat("0.00");
         travelCount.setTotalPrice(Double.parseDouble(df.format(entranceTotal+eatTotal+travelCount.getGroupTotal()+stayTotal+travelTotal)));
     }

--
Gitblit v1.9.1