From 41e05da9a811cd9394ce9bddf5edcb7cde58db06 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 06 三月 2025 16:49:36 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang --- ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java index efaf81f..635ebdf 100644 --- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java +++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java @@ -156,21 +156,21 @@ @ApiOperation("待办列表") @PostMapping("/wait/task/page") public AjaxResult<PageInfo<ProcessTaskListVO>> waitTaskPage(@RequestBody ProcessTaskListBO processTemplatePageBO) { - return AjaxResult.success(processTemplateService.waitTaskPage(processTemplatePageBO)); + return AjaxResult.success(processTemplateService.waitTaskPageApplet(processTemplatePageBO)); } //已办 @ApiOperation("已办列表") @PostMapping("/deal/task/page") public AjaxResult<PageInfo<ProcessTaskListVO>> dealTaskPage(@RequestBody ProcessTaskListBO processTemplatePageBO) { - return AjaxResult.success(processTemplateService.dealTaskPage(processTemplatePageBO)); + return AjaxResult.success(processTemplateService.dealTaskPageApplet(processTemplatePageBO)); } - //待办和已办列表 - @ApiOperation("待办和已办列表") - @PostMapping("/dealAndWait/task/page") - public AjaxResult<PageInfo<ProcessTaskListVO>> dealAndWaitTaskPage(@RequestBody ProcessTaskListBO processTemplatePageBO) { - return AjaxResult.success(processTemplateService.dealAndWaitTaskPage(processTemplatePageBO)); + //我发起的 + @ApiOperation("我发起的列表") + @PostMapping("/initiate/task/page") + public AjaxResult<PageInfo<ProcessTaskListVO>> initiateTaskPage(@RequestBody ProcessTaskListBO processTemplatePageBO) { + return AjaxResult.success(processTemplateService.initiateTaskPage(processTemplatePageBO)); } //抄送 -- Gitblit v1.7.1