|
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
8
|
8
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
9
|
9
|
import lombok.RequiredArgsConstructor;
|
10
|
10
|
import org.dromara.backstage.consumption.domain.XfConsumeDetail;
|
|
11
|
+import org.dromara.backstage.consumption.domain.XfCreditAccount;
|
11
|
12
|
import org.dromara.backstage.consumption.domain.XfTerm;
|
12
|
13
|
import org.dromara.backstage.consumption.domain.bo.XfConsumeDetailBo;
|
13
|
14
|
import org.dromara.backstage.consumption.domain.vo.XfConsumeDetailVo;
|
|
@@ -56,6 +57,10 @@ public class XfConsumeDetailServiceImpl implements IXfConsumeDetailService {
|
56
|
57
|
@Override
|
57
|
58
|
public TableDataInfo<XfConsumeDetailVo> queryPageList(XfConsumeDetailBo bo, PageQuery pageQuery) {
|
58
|
59
|
LambdaQueryWrapper<XfConsumeDetail> lqw = buildQueryWrapper(bo);
|
|
60
|
+ Map<String, Object> params = bo.getParams();
|
|
61
|
+ lqw.between(params.get("beginConsumeDate") != null && params.get("endConsumeDate") != null,
|
|
62
|
+ XfConsumeDetail::getConsumeDate, params.get("beginConsumeDate"), params.get("endConsumeDate"));
|
|
63
|
+ lqw.orderByDesc(XfConsumeDetail::getConsumeDate);
|
59
|
64
|
Page<XfConsumeDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
60
|
65
|
return TableDataInfo.build(result);
|
61
|
66
|
}
|