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); } + + }