删除系统内报告模板;量表列表增加发布次数倒叙

This commit is contained in:
cjw 2024-06-12 16:12:04 +08:00
parent 2fa343b09b
commit 8931496113
6 changed files with 2 additions and 1 deletions

View File

@ -52,6 +52,7 @@ public class SysScaleServiceImpl implements ISysScaleService {
@Override @Override
public TableDataInfo<SysScaleVo> queryPageList(SysScaleBo bo, PageQuery pageQuery) { public TableDataInfo<SysScaleVo> queryPageList(SysScaleBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysScale> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<SysScale> lqw = buildQueryWrapper(bo);
lqw.orderByDesc(SysScale::getUpdateTime);
Page<SysScaleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<SysScaleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
for (SysScaleVo record : result.getRecords()) { for (SysScaleVo record : result.getRecords()) {
List<SysDictDataVo> scaleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("scale_type", StrUtil.join(StrUtil.COMMA, record.getScaleType())); List<SysDictDataVo> scaleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("scale_type", StrUtil.join(StrUtil.COMMA, record.getScaleType()));
@ -72,6 +73,7 @@ public class SysScaleServiceImpl implements ISysScaleService {
@Override @Override
public List<SysScaleVo> queryList(SysScaleBo bo) { public List<SysScaleVo> queryList(SysScaleBo bo) {
LambdaQueryWrapper<SysScale> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<SysScale> lqw = buildQueryWrapper(bo);
lqw.orderByDesc(SysScale::getPublishNums);
return baseMapper.selectVoList(lqw); return baseMapper.selectVoList(lqw);
} }
@ -83,7 +85,6 @@ public class SysScaleServiceImpl implements ISysScaleService {
if(CollUtil.isNotEmpty(bo.getScaleType())){ if(CollUtil.isNotEmpty(bo.getScaleType())){
lqw.like(CollUtil.isNotEmpty(bo.getScaleType()), SysScale::getScaleType, bo.getScaleType().get(0)); lqw.like(CollUtil.isNotEmpty(bo.getScaleType()), SysScale::getScaleType, bo.getScaleType().get(0));
} }
lqw.orderByDesc(SysScale::getUpdateTime);
return lqw; return lqw;
} }