fix:十二分制-奖惩规则

This commit is contained in:
wangff
2025-11-05 15:40:31 +08:00
parent 75a0ad4676
commit 85a411bc9a
13 changed files with 28 additions and 10 deletions

View File

@@ -62,7 +62,7 @@ public class TpRuleServiceImpl implements TpRuleService {
@Override
public PageInfo<TpPenaltyRuleListVO> penaltyRulePage(TpRuleQueryRequest request) {
PageHelper.startPage(request.getPageNum(), request.getPageSize());
List<TpRuleDO> list = tpRuleDAO.getList(request);
List<TpRuleDO> list = tpRuleDAO.getEffectiveList(request);
PageInfo<TpRuleDO> page = new PageInfo<>(list);
PageInfo<TpPenaltyRuleListVO> newPage = BeanUtil.toPage(page, TpPenaltyRuleListVO.class);
dictService.fillDictField(newPage.getList());
@@ -97,7 +97,7 @@ public class TpRuleServiceImpl implements TpRuleService {
@Override
public PageInfo<TpRewardRuleDetailVO> rewardRulePage(TpRuleQueryRequest request) {
PageHelper.startPage(request.getPageNum(), request.getPageSize());
List<TpRuleDO> list = tpRuleDAO.getList(request);
List<TpRuleDO> list = tpRuleDAO.getEffectiveList(request);
PageInfo<TpRuleDO> page = new PageInfo<>(list);
PageInfo<TpRewardRuleDetailVO> newPage = BeanUtil.toPage(page, TpRewardRuleDetailVO.class);
dictService.fillDictField(newPage.getList());