From a2e4f4e2aad027c72799588ec2a4deac73779e17 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 27 八月 2023 19:43:44 +0800
Subject: [PATCH] 815646
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java | 11 ++++++++++-
1 files changed, 10 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..3955b20 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;
@@ -319,6 +325,9 @@
zTravelPrice.setEndTime(priceDto.getEndTime());
zTravelPrice.setTotalDay(totalDay);
zTravelPrice.setTitle(priceDto.getTitle());
+ zTravelPrice.setTableName(priceDto.getTableName());
+ zTravelPrice.setProperty(priceDto.getProperty());
+ zTravelPrice.setType(priceDto.getType());
zTravelPrice.setEat(eatTotal);
zTravelPrice.setStay(stayTotal);
zTravelPrice.setTraffic(trafficTotal);
--
Gitblit v1.9.1