mozhe
/
school-file-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

目录排序优化，同步教材学校空间返回值优化

This commit is contained in:
cjw 2024-07-22 15:30:02 +08:00
parent ba6fa6dc98
commit 40c6e3b3cb
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java
View File

@ -26,6 +26,7 @@ public interface SysOssTextbookMapper extends BaseMapperPlus<SysOssTextbook, Sys
}) })
Page<SysOssTextbookVo> selectPageList(@Param("page") Page<SysOssTextbook> page, Page<SysOssTextbookVo> selectPageList(@Param("page") Page<SysOssTextbook> page,
@Param(Constants.WRAPPER) Wrapper<SysOssTextbook> queryWrapper); @Param(Constants.WRAPPER) Wrapper<SysOssTextbook> queryWrapper);
Page<SysOssTextbookVo> selectPageList4School(@Param("page") Page<SysOssTextbook> page, Page<SysOssTextbookVo> selectPageList4School(@Param("page") Page<SysOssTextbook> page,
@Param(Constants.WRAPPER) Wrapper<SysOssTextbook> queryWrapper); @Param(Constants.WRAPPER) Wrapper<SysOssTextbook> queryWrapper);

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java
View File

@ -128,7 +128,10 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService
lqw.like(bo.getParentId() != null, SysCatalogResource::getAncestors, bo.getParentId()); lqw.like(bo.getParentId() != null, SysCatalogResource::getAncestors, bo.getParentId());
lqw.eq(bo.getType() != null, SysCatalogResource::getType, bo.getType()); lqw.eq(bo.getType() != null, SysCatalogResource::getType, bo.getType());
lqw.eq(SysCatalogResource::getDelFlag, 0); lqw.eq(SysCatalogResource::getDelFlag, 0);
lqw.orderByAsc(SysCatalogResource::getAncestors);
lqw.orderByAsc(SysCatalogResource::getParentId);
lqw.orderByAsc(SysCatalogResource::getOrderNum); lqw.orderByAsc(SysCatalogResource::getOrderNum);
lqw.orderByAsc(SysCatalogResource::getCatalogId);
return lqw; return lqw;
} }

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java
View File

@ -91,7 +91,11 @@ public class SysCatalogTextbookServiceImpl implements ISysCatalogTextbookService
lqw.like(bo.getParentId() != null, SysCatalogTextbook::getAncestors, bo.getParentId()); lqw.like(bo.getParentId() != null, SysCatalogTextbook::getAncestors, bo.getParentId());
lqw.le(bo.getType() != null, SysCatalogTextbook::getType, bo.getType()); lqw.le(bo.getType() != null, SysCatalogTextbook::getType, bo.getType());
lqw.eq(SysCatalogTextbook::getDelFlag, 0); lqw.eq(SysCatalogTextbook::getDelFlag, 0);
lqw.orderByAsc(SysCatalogTextbook::getAncestors);
lqw.orderByAsc(SysCatalogTextbook::getParentId);
lqw.orderByAsc(SysCatalogTextbook::getOrderNum); lqw.orderByAsc(SysCatalogTextbook::getOrderNum);
lqw.orderByAsc(SysCatalogTextbook::getCatalogId);
//lqw.orderByAsc(SysCatalogTextbook::getOrderNum);
return lqw; return lqw;
} }

2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml
View File

@ -10,7 +10,7 @@
${ew.getCustomSqlSegment} ${ew.getCustomSqlSegment}
</select> </select>
<select id="selectPageList4School"> <select id="selectPageList4School" resultType="org.dromara.system.domain.vo.SysOssTextbookVo">
select ot.*, o.volume select ot.*, o.volume
from sys_oss_textbook ot from sys_oss_textbook ot
left join sys_oss o on o.oss_id = ot.oss_id left join sys_oss o on o.oss_id = ot.oss_id