From fccfe7d50f42f5be4c4612d61b7ae852e2ef37cd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 17 四月 2025 15:26:09 +0800
Subject: [PATCH] 优化指派设备与审签设备的权限校验查询，新增导入电子样板触发审签流程，新增电子样板指派设备功能
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 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..43926c7 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,12 +13,15 @@
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;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
/**
@@ -35,6 +38,8 @@
@Autowired
private IDispatchFileService dispatchFileService;
+ @Autowired
+ private IHisWorkTaskService hisWorkTaskService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -59,14 +64,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,9 +82,28 @@
*/
@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);
+ }
+
+ /**
+ * 鎵归噺瀹℃壒鎿嶄綔
+ * @param dispatchFileFlowTaskVo
+ * @return
+ */
+ @AutoLog(value = "nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鎵归噺瀹℃壒鎿嶄綔")
+ @ApiOperation(value="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鎵归噺瀹℃壒鎿嶄綔", notes="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鎵归噺瀹℃壒鎿嶄綔")
+ @PostMapping(value = "/approvalBatch")
+ public Result<?> approvalBatch(@RequestBody DispatchFileFlowTaskVo dispatchFileFlowTaskVo) throws InvocationTargetException, IllegalAccessException {
+ return dispatchFileService.auditBatchDispatchFile(dispatchFileFlowTaskVo);
+ }
+
+
+ @ApiOperation(value = "鑾峰彇宸ヤ綔娴佸巻鍙蹭换鍔�", response = FlowTaskDto.class)
+ @GetMapping(value = "/queryHisTaskList")
+ public Result<?> queryHisTaskList(@RequestParam(name = "procInstId") String procInstId) {
+ return Result.OK(hisWorkTaskService.queryHisTaskByProcInstId(procInstId));
}
/**
@@ -159,10 +183,16 @@
return Result.OK(dispatchFile);
}
- @GetMapping(value = "/selectVoById")
- public Result<?> selectVoById(@RequestParam(name="id") String id){
- return dispatchFileService.queryDispatchFile(id);
- }
+ /**
+ * 鏌ヨ瀹＄鍩烘湰淇℃伅
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "鏌ヨ瀹＄鍩烘湰淇℃伅", notes = "鏌ヨ瀹＄鍩烘湰淇℃伅")
+ @GetMapping(value = "/selectVoById")
+ public Result<?> selectVoById(@RequestParam(name="id") String id){
+ return dispatchFileService.queryDispatchFile(id);
+ }
/**
* 瀵煎嚭excel
--
Gitblit v1.9.3