From 00626819c649f91323dfcf74e5682cb8faac5b48 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 18 Jun 2024 14:52:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=BE=85=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=92=8C=E9=80=9A=E8=BF=87=E5=AE=A1=E6=A0=B8=E7=9A=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/file/SysOssTextbookController.java | 11 ++++++++++- .../dromara/system/mapper/SysOssTextbookMapper.java | 9 ++++++++- .../system/service/ISysOssTextbookService.java | 9 +++++++++ .../service/impl/SysOssTextbookServiceImpl.java | 11 ++++++++++- .../resources/mapper/system/SysOssTextbookMapper.xml | 10 +++++++++- 5 files changed, 46 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java index b5bdf71..6014e07 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java @@ -36,7 +36,7 @@ public class SysOssTextbookController extends BaseController { private final ISysOssTextbookService sysOssTextbookService; /** - * 查询【请填写功能名称】列表 + * 查询列表 */ @SaCheckPermission("file:textbook:pageList") @GetMapping("/pageList") @@ -44,6 +44,15 @@ public class SysOssTextbookController extends BaseController { return sysOssTextbookService.queryPageList(bo, pageQuery); } + /** + * 待审核查询列表 + */ + @SaCheckPermission("file:textbook:awaitList") + @GetMapping("await/pageList") + public TableDataInfo awaitList(SysOssTextbookBo bo, PageQuery pageQuery) { + return sysOssTextbookService.queryAwaitPageList(bo, pageQuery); + } + /** * 获取【请填写功能名称】详细信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java index b851961..def943b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.SysOssTextbook; import org.dromara.system.domain.vo.SysOssTextbookVo; @@ -18,6 +20,11 @@ import org.dromara.system.domain.vo.SysOssTextbookVo; */ @Mapper public interface SysOssTextbookMapper extends BaseMapperPlus { - Page selectPageUserList(@Param("page") Page page, + Page selectPageList(@Param("page") Page page, + @Param(Constants.WRAPPER) Wrapper queryWrapper); + @DataPermission({ + @DataColumn(key = "userName", value = "create_by") + }) + Page selectPageAwaitList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java index d85aa18..0de1567 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java @@ -34,6 +34,15 @@ public interface ISysOssTextbookService { */ TableDataInfo queryPageList(SysOssTextbookBo bo, PageQuery pageQuery); + /** + * 待审核查询列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryAwaitPageList(SysOssTextbookBo bo, PageQuery pageQuery); + /** * 查询符合条件的【请填写功能名称】列表 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java index 3b07f24..0a524b4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java @@ -64,7 +64,16 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { */ @Override public TableDataInfo queryPageList(SysOssTextbookBo bo, PageQuery pageQuery) { - Page result = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(bo)); + bo.setStatus(1); + Page result = baseMapper.selectPageList(pageQuery.build(), this.buildQueryWrapper(bo)); + return TableDataInfo.build(result); + } + + @Override + public TableDataInfo queryAwaitPageList(SysOssTextbookBo bo, PageQuery pageQuery) { + QueryWrapper wrapper = Wrappers.query(); + wrapper.le("ot.status",0); + Page result = baseMapper.selectPageAwaitList(pageQuery.build(), wrapper); return TableDataInfo.build(result); } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml index 9c8f119..f587bd4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml @@ -4,11 +4,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select ot.*,o.file_suffix,o.volume from sys_oss_textbook ot left join sys_catalog_textbook ct on ct.catalog_id = ot.catalog_id left join sys_oss o on o.oss_id = ot.oss_id ${ew.getCustomSqlSegment} + +