From 4e2be858f4ccbb7490b59ed584fd1c829eb4d556 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 01 四月 2025 15:22:47 +0800
Subject: [PATCH] 修改审签问题
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java
index 6e7f712..6d338fb 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java
@@ -13,6 +13,8 @@
import org.jeecg.modules.dncFlow.entity.DispatchFile;
import org.jeecg.modules.dncFlow.service.IDispatchFileService;
import org.jeecg.modules.dncFlow.vo.DispatchFileFlowTaskVo;
+import org.jeecg.modules.flowable.domain.dto.FlowTaskDto;
+import org.jeecg.modules.flowable.service.IHisWorkTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -35,6 +37,8 @@
@Autowired
private IDispatchFileService dispatchFileService;
+ @Autowired
+ private IHisWorkTaskService hisWorkTaskService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -59,14 +63,14 @@
/**
* 閲嶆柊鍚姩
- * @param id
+ * @param dispatchFileFlowTaskVo
* @return
*/
@AutoLog(value = "nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-閲嶆柊鍚姩")
@ApiOperation(value="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-閲嶆柊鍚姩", notes="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-閲嶆柊鍚姩")
- @GetMapping(value = "/saveDispatchFile")
- public Result<?> saveDispatchFile(String id){
- return dispatchFileService.reStartDispatchFile(id);
+ @PostMapping(value = "/saveDispatchFile")
+ public Result<?> saveDispatchFile(@RequestBody DispatchFileFlowTaskVo dispatchFileFlowTaskVo){
+ return dispatchFileService.reStartDispatchFile(dispatchFileFlowTaskVo);
}
@@ -77,11 +81,18 @@
*/
@AutoLog(value = "nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-瀹℃壒鎿嶄綔")
@ApiOperation(value="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-瀹℃壒鎿嶄綔", notes="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-瀹℃壒鎿嶄綔")
- @GetMapping(value = "/approval")
- public Result<?> approval(DispatchFileFlowTaskVo dispatchFileFlowTaskVo){
+ @PostMapping(value = "/approval")
+ public Result<?> approval(@RequestBody DispatchFileFlowTaskVo dispatchFileFlowTaskVo){
return dispatchFileService.auditDispatchFile(dispatchFileFlowTaskVo);
}
+
+ @ApiOperation(value = "鑾峰彇宸ヤ綔娴佸巻鍙蹭换鍔�", response = FlowTaskDto.class)
+ @GetMapping(value = "/queryHisTaskList")
+ public Result<?> queryHisTaskList(@RequestParam(name = "procInstId") String procInstId) {
+ return Result.OK(hisWorkTaskService.queryHisTaskByProcInstId(procInstId));
+ }
+
/**
* 娣诲姞
*
--
Gitblit v1.9.3