修改bug

zqy

2024-08-05 30fef489f5f39fc4c600e3f99fdf909c158b4414

 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);
    }