From db69e6a02f18a3440dd77aef648b56a964b91021 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 06 八月 2024 19:23:11 +0800
Subject: [PATCH] 修改导入用户，注册bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailServiceImpl.java
index 1d2df06..bc7e65a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailServiceImpl.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.domain.TravelCount;
import com.ruoyi.domain.TravelDetail;
+import com.ruoyi.domain.ZfCollection;
import com.ruoyi.mapper.TravelDetailMapper;
import com.ruoyi.service.TravelDetailService;
import org.springframework.stereotype.Service;
@@ -22,9 +24,19 @@
public class TravelDetailServiceImpl extends ServiceImpl<TravelDetailMapper, TravelDetail> implements TravelDetailService {
@Override
- public List<TravelDetail> getDataByCid(Long cid) {
+ public List<TravelDetail> getDataByCid(Long cid,TravelDetail travelDetail) {
LambdaQueryWrapper<TravelDetail> lqw = new LambdaQueryWrapper<>();
lqw.eq(TravelDetail::getCid,cid);
+ if(travelDetail!=null){
+ lqw.like(travelDetail.getAddress()!=null,TravelDetail::getAddress,travelDetail.getAddress());
+ lqw.like(travelDetail.getScenic()!=null,TravelDetail::getScenic,travelDetail.getScenic());
+ lqw.like(travelDetail.getHotel()!=null,TravelDetail::getHotel,travelDetail.getHotel());
+ lqw.like(travelDetail.getTravelMode()!=null,TravelDetail::getTravelMode,travelDetail.getTravelMode());
+ lqw.like(travelDetail.getFlight()!=null,TravelDetail::getFlight,travelDetail.getFlight());
+ lqw.like(travelDetail.getDocument()!=null,TravelDetail::getDocument,travelDetail.getDocument());
+ lqw.between(travelDetail.getHappenStartTime() != null && travelDetail.getHappenEndTime() != null, TravelDetail::getHappenDate, travelDetail.getHappenStartTime(), travelDetail.getHappenEndTime());
+ }
+
lqw.orderBy(true,true,TravelDetail::getHappenDate);
return list(lqw);
}
--
Gitblit v1.9.1