From 1930b4e59d60c015ffa7bfee92e4bc227b90dcb3 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 28 五月 2025 15:41:41 +0800
Subject: [PATCH] 1.Dnc产品结构树检索nc文件 2.新增批次功能 3.新增审签查询流程 4.修改刀具系统查询

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java |   65 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 11 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..35234c4 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;
 	/**
 	 * 鍒嗛〉鍒楄〃鏌ヨ
 	 *
@@ -44,7 +49,6 @@
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鍒嗛〉鍒楄〃鏌ヨ")
 	@ApiOperation(value="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鍒嗛〉鍒楄〃鏌ヨ", notes="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鍒嗛〉鍒楄〃鏌ヨ")
 	@GetMapping(value = "/list")
 	public Result<IPage<DispatchFile>> queryPageList(DispatchFile dispatchFile,
@@ -58,15 +62,29 @@
 	}
 
 	 /**
+	  * 鏂囦欢鏌ヨ瀹＄娴佺▼
+	  * @param attributionId,attributionType,docId
+	  * @return
+	  */
+	 @AutoLog(value = "nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鏂囦欢鏌ヨ瀹＄娴佺▼")
+	 @ApiOperation(value="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鏂囦欢鏌ヨ瀹＄娴佺▼", notes="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鏂囦欢鏌ヨ瀹＄娴佺▼")
+	 @GetMapping(value = "/queryDispatchDocFile")
+	 public Result<?> queryDispatchDocFile(@RequestParam(name="attributionId") String attributionId,
+	 										@RequestParam(name="attributionType") String attributionType,
+	 										@RequestParam(name="docId") String docId){
+		 return dispatchFileService.queryDispatchDocFile(attributionId,attributionType,docId);
+	 }
+
+	 /**
 	  * 閲嶆柊鍚姩
-	  * @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 +95,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 +196,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