From 68f85f044cd71cd3db6514c3bf5b5129ed2e3e78 Mon Sep 17 00:00:00 2001
From: zqy <2522236926>
Date: 星期一, 10 六月 2024 23:44:50 +0800
Subject: [PATCH] 家庭小医生的分享

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
index 6ed0f80..ad5769a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
@@ -68,8 +68,14 @@
         LambdaQueryWrapper<ZTravelPrice> lqw = new LambdaQueryWrapper<>();
         lqw.eq(ZTravelPrice::getMyId, userId)
                 .eq(zTravelPrice.getTotalDay() != null, ZTravelPrice::getTotalDay, zTravelPrice.getTotalDay())
+                .like(StringUtils.isNotEmpty(zTravelPrice.getTitle()),ZTravelPrice::getTitle,zTravelPrice.getTitle())
+                .eq(zTravelPrice.getTotalCost()!=null,ZTravelPrice::getTotalCost,zTravelPrice.getTotalCost())
                 .le(zTravelPrice.getEnd() != null, ZTravelPrice::getEndTime, zTravelPrice.getEnd())
-                .ge(zTravelPrice.getStart() != null, ZTravelPrice::getStartTime, zTravelPrice.getStart());
+                .ge(zTravelPrice.getStart() != null, ZTravelPrice::getStartTime, zTravelPrice.getStart())
+                .eq(zTravelPrice.getEat()!=null,ZTravelPrice::getEat,zTravelPrice.getEat())
+                .eq(zTravelPrice.getStay()!=null,ZTravelPrice::getStay,zTravelPrice.getStay())
+                .eq(zTravelPrice.getTraffic()!=null,ZTravelPrice::getTraffic,zTravelPrice.getTraffic())
+                .eq(zTravelPrice.getShopping()!=null,ZTravelPrice::getShopping,zTravelPrice.getShopping());
 
         lqw.orderBy(true, true, ZTravelPrice::getStartTime);
         return lqw;
@@ -207,6 +213,10 @@
         zTravelPrice.setEndTime(priceDto.getEndTime());
         zTravelPrice.setTotalDay(totalDay);
         zTravelPrice.setTitle(priceDto.getTitle());
+        zTravelPrice.setTableName(priceDto.getTableName());
+        zTravelPrice.setProperty(priceDto.getProperty());
+        zTravelPrice.setType(priceDto.getType());
+        zTravelPrice.setDestination(priceDto.getDestination());
         zTravelPrice.setEat(eatTotal);
         zTravelPrice.setStay(stayTotal);
         zTravelPrice.setTraffic(trafficTotal);
@@ -319,6 +329,10 @@
         zTravelPrice.setEndTime(priceDto.getEndTime());
         zTravelPrice.setTotalDay(totalDay);
         zTravelPrice.setTitle(priceDto.getTitle());
+        zTravelPrice.setTableName(priceDto.getTableName());
+        zTravelPrice.setProperty(priceDto.getProperty());
+        zTravelPrice.setType(priceDto.getType());
+        zTravelPrice.setDestination(priceDto.getDestination());
         zTravelPrice.setEat(eatTotal);
         zTravelPrice.setStay(stayTotal);
         zTravelPrice.setTraffic(trafficTotal);

--
Gitblit v1.9.1