zqy
2024-06-10 68f85f044cd71cd3db6514c3bf5b5129ed2e3e78
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.domain.TravelCount;
import com.ruoyi.domain.TravelDetail;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.TravelCountMapper;
import com.ruoyi.service.TravelCountService;
import com.ruoyi.service.TravelDetailService;
@@ -38,7 +39,7 @@
    private TravelCountService travelCountService;
    @Override
    public AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize, TravelCount travelCount, @JsonFormat(pattern = "yyyy-MM-dd") Date happenStartTime, @JsonFormat(pattern = "yyyy-MM-dd") Date happenEndTime) {
    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);
@@ -58,8 +59,7 @@
        if(happenEndTime!=null){
            lqw.lt(TravelCount::getEndTime,happenEndTime);
        }
        lqw.orderByDesc(TravelCount::getCreateTime);
        Page<TravelCount> resultPage = page(new Page<>(pageNum, pageSize), lqw);
        resultPage.getRecords().forEach(this::inputTotalData);