From 7685af4ed67c693d197393f56f392d7b12434853 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 27 二月 2025 16:43:42 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java
index abb00c3..46e24ae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/StateProcessController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.api;
+import com.aizuda.bpm.engine.entity.FlwTask;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -18,9 +19,11 @@
import com.ruoyi.system.bo.*;
import com.ruoyi.system.model.StateProcessModule;
import com.ruoyi.system.model.StateProcessTemplate;
+import com.ruoyi.system.model.TContract;
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;
@@ -163,6 +166,13 @@
return AjaxResult.success(processTemplateService.dealTaskPage(processTemplatePageBO));
}
+ //待办和已办列表
+ @ApiOperation("待办和已办列表")
+ @PostMapping("/dealAndWait/task/page")
+ public AjaxResult<PageInfo<ProcessTaskListVO>> dealAndWaitTaskPage(@RequestBody ProcessTaskListBO processTemplatePageBO) {
+ return AjaxResult.success(processTemplateService.dealAndWaitTaskPage(processTemplatePageBO));
+ }
+
//抄送
@ApiOperation("抄送列表")
@PostMapping("/copy/task/page")
@@ -188,4 +198,12 @@
return AjaxResult.success();
}
+ //审核详情
+ @ApiOperation("审核详情")
+ @GetMapping("/detail")
+ public AjaxResult<ProcessDetailVO> detail(@RequestParam String taskId) {
+ ProcessDetailVO detail = processTemplateService.detail(taskId);
+ return AjaxResult.success(detail);
+ }
+
}
--
Gitblit v1.7.1