From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 740ebcd..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
@@ -20,6 +20,7 @@
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.StateProcessModuleService;
import com.ruoyi.system.service.StateProcessTemplateService;
+import com.ruoyi.system.vo.ProcessDetailVO;
import com.ruoyi.system.vo.ProcessTaskListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -155,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));
}
//抄送
@@ -197,12 +198,12 @@
return AjaxResult.success();
}
- //审核拒绝
+ //审核详情
@ApiOperation("审核详情")
@GetMapping("/detail")
- public AjaxResult<TContract> detail(@RequestParam String taskId) {
- processTemplateService.detail(taskId);
- return AjaxResult.success();
+ public AjaxResult<ProcessDetailVO> detail(@RequestParam String taskId) {
+ ProcessDetailVO detail = processTemplateService.detail(taskId);
+ return AjaxResult.success(detail);
}
}
--
Gitblit v1.7.1