From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 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 35234c4..dde92ae 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
@@ -10,6 +10,10 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.dnc.entity.DocInfo;
+import org.jeecg.modules.dnc.response.CommonCode;
+import org.jeecg.modules.dnc.response.ResponseResult;
+import org.jeecg.modules.dnc.service.IDocInfoService;
import org.jeecg.modules.dncFlow.entity.DispatchFile;
import org.jeecg.modules.dncFlow.service.IDispatchFileService;
import org.jeecg.modules.dncFlow.vo.DispatchFileFlowTaskVo;
@@ -40,6 +44,8 @@
@Autowired
private IHisWorkTaskService hisWorkTaskService;
+ @Autowired
+ private IDocInfoService docInfoService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -73,6 +79,18 @@
@RequestParam(name="attributionType") String attributionType,
@RequestParam(name="docId") String docId){
return dispatchFileService.queryDispatchDocFile(attributionId,attributionType,docId);
+ }
+
+ /**
+ * 鍏朵粬鏂囨。鎵嬪姩鍙戣捣娴佺▼
+ * @param dispatchFile
+ * @return
+ */
+ @AutoLog(value = "nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鍏朵粬鏂囨。鎵嬪姩鍙戣捣娴佺▼")
+ @ApiOperation(value="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鍏朵粬鏂囨。鎵嬪姩鍙戣捣娴佺▼", notes="nc绋嬪簭涓庣數瀛愬浘鐗堢娲�-鍏朵粬鏂囨。鎵嬪姩鍙戣捣娴佺▼")
+ @PostMapping(value = "/startDispatchFile")
+ public Result<?> startDispatchFile(@RequestBody DispatchFile dispatchFile){
+ return dispatchFileService.saveDispatchFile(dispatchFile);
}
/**
@@ -231,5 +249,20 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, DispatchFile.class);
}
+ @AutoLog(value = "鏂囨。琛�-瀹氬瀷娴佺▼鍙戣捣")
+ @ApiOperation(value = "鏂囨。琛�-瀹氬瀷娴佺▼鍙戣捣", notes = "鏂囨。琛�-瀹氬瀷娴佺▼鍙戣捣")
+ @PostMapping("/submitProccess")
+ public Result<?> submitProccess(@RequestBody DispatchFile dispatchFile) {
+ return dispatchFileService.submitProccess(dispatchFile);
+ }
+ @AutoLog(value = "鏂囨。琛�-淇℃伅鏌ヨ")
+ @ApiOperation(value = "鏂囨。琛�-淇℃伅鏌ヨ", notes = "鏂囨。琛�-淇℃伅鏌ヨ")
+ @GetMapping("/queryDocInfoByFlowDataId")
+ public Result<DocInfo> queryDocInfoByFlowDataId(@RequestParam("dataId") String dataId) {
+ DispatchFile dispatchFile = dispatchFileService.getById(dataId);
+ DocInfo docInfo = docInfoService.getById(dispatchFile.getDocId());
+ return Result.OK(docInfo);
+ }
+
}
--
Gitblit v1.9.3