张氏APP 后台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
feige
2025-06-23 082ba3d3cd975f182425448bcea3a9166b70980b 
 zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java


@@ -8,15 +8,19 @@


import com.ruoyi.common.utils.MapUtils;


import com.ruoyi.domain.TravelCount;


import com.ruoyi.domain.TravelDetail;


import com.ruoyi.domain.ZInfoUser;


import com.ruoyi.domain.ZProperty;


import com.ruoyi.mapper.TravelCountMapper;


import com.ruoyi.service.TravelCountService;


import com.ruoyi.service.TravelDetailService;


import com.ruoyi.service.ZInfoUserService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import java.text.DecimalFormat;


import java.util.List;


import java.util.stream.Collectors;




/**


 * <p>


@@ -34,12 +38,13 @@




    @Autowired


    private TravelCountService travelCountService;




    @Autowired


    ZInfoUserService zInfoUserService;


    @Override


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


       // lqw.eq(TravelCount::getUid,userId);


        if(travelCount!=null){


            lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());


            lqw.like(travelCount.getDestination()!=null,TravelCount::getDestination,travelCount.getDestination());


@@ -58,6 +63,21 @@


        }


        lqw.orderByDesc(TravelCount::getCreateTime);






        System.out.println("--sdfdsf000sfssssssssssssssssss");


        //根据userId查询到infouser的uaid


        ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);


        //拿到所有的sysid


        List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());


//        LambdaQueryWrapper<TravelCount> lqw;


        if(!fms.isEmpty())


            lqw = lqw.in(TravelCount::getUid, fms);


        else


            lqw.eq(TravelCount::getUid,userId);


//        else


//            lqw = buildCondition(zProperty, userId);






        Page<TravelCount> resultPage = page(new Page<>(pageNum, pageSize), lqw);


        resultPage.getRecords().forEach(this::inputTotalData);


        return AjaxResult.success(MapUtils.getResult(resultPage));