Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfConsumeDetailServiceImpl.java

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

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfCreditAccountServiceImpl.java

@@ -52,6 +52,10 @@ public class XfCreditAccountServiceImpl implements IXfCreditAccountService {
     @Override
     public TableDataInfo<XfCreditAccountVo> queryPageList(XfCreditAccountBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<XfCreditAccount> lqw = buildQueryWrapper(bo);
+        Map<String, Object> params = bo.getParams();
+        lqw.between(params.get("beginCreditTime") != null && params.get("endCreditTime") != null,
+            XfCreditAccount::getCreditTime, params.get("beginCreditTime"), params.get("endCreditTime"));
+        lqw.orderByDesc(XfCreditAccount::getCreditTime);
         Page<XfCreditAccountVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }