From bb0457635cdcc199f8bf8b3f7ba73e9374b8329d Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 21 Oct 2025 17:08:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=96=B0=E5=A2=9E=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=BF=9B=E5=BA=A6=E6=AD=A5=E9=AA=A4=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 IOaProjectScheduleStepService 接口中新增 queryPageListPage 方法定义 - 在 OaProjectScheduleStepController 控制器中添加 /listPage GET 接口- 在 OaProjectScheduleStepServiceImpl 实现类中实现 queryPageListPage 方法 - 调整代码格式,增加空行以提升可读性 --- .../oa/controller/OaProjectScheduleStepController.java | 7 +++++++ .../ruoyi/oa/service/IOaProjectScheduleStepService.java | 1 + .../oa/service/impl/OaProjectScheduleStepServiceImpl.java | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectScheduleStepController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectScheduleStepController.java index dbed69a..3b73766 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectScheduleStepController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProjectScheduleStepController.java @@ -47,6 +47,13 @@ public class OaProjectScheduleStepController extends BaseController { public TableDataInfo list(OaProjectScheduleStepBo bo, PageQuery pageQuery) { return iOaProjectScheduleStepService.queryPageList(bo, pageQuery); } + /** + * 查询项目进度步骤跟踪列表 + */ + @GetMapping("/listPage") + public TableDataInfo listPage(OaProjectScheduleStepBo bo, PageQuery pageQuery) { + return iOaProjectScheduleStepService.queryPageListPage(bo, pageQuery); + } /** * 导出项目进度步骤跟踪列表 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaProjectScheduleStepService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaProjectScheduleStepService.java index 3dec809..951e6f5 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaProjectScheduleStepService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaProjectScheduleStepService.java @@ -65,4 +65,5 @@ public interface IOaProjectScheduleStepService{ void batchInsertNodes(List nodeList, Long scheduleId); + TableDataInfo queryPageListPage(OaProjectScheduleStepBo bo, PageQuery pageQuery); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java index bbcee1b..ab54ae3 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java @@ -60,6 +60,12 @@ public class OaProjectScheduleStepServiceImpl implements IOaProjectScheduleStepS Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw,LoginHelper.getUserId()); return TableDataInfo.build(result); } + @Override + public TableDataInfo queryPageListPage(OaProjectScheduleStepBo bo, PageQuery pageQuery) { + QueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } /** * 查询项目进度步骤跟踪列表 @@ -229,4 +235,6 @@ public class OaProjectScheduleStepServiceImpl implements IOaProjectScheduleStepS // 批量插入数据库 baseMapper.saveBatch(entities); } + + }