From 5d99227a97b7b244893b748af28e7f78238d2951 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 05 九月 2025 01:15:15 +0800
Subject: [PATCH] 任务提醒，增加导出提醒；
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java
index ba4f0b1..f55ce6c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java
@@ -10,6 +10,8 @@
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.springblade.core.tool.api.R;
+import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.ApproveRecordService;
@@ -19,9 +21,13 @@
import org.springblade.mdm.flow.service.execute.AbstractFlowCompleteService;
import org.springblade.mdm.flow.service.execute.DefaultFlowCompleteService;
import org.springblade.mdm.flow.service.execute.TryFlowCompleteService;
+import org.springblade.mdm.flow.vo.ProgramUploadVO;
import org.springblade.mdm.flow.vo.ReplaceFlowStartVO;
+import org.springblade.mdm.flow.vo.ReplaceUploadVO;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.service.ProcessProgRefService;
+import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
+import org.springblade.mdm.program.vo.NcNodeVO;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@@ -32,27 +38,15 @@
@RequestMapping("/flow/replace")
@Tag(name = "鏇挎崲娴佺▼", description = "鏇挎崲娴佺▼")
public class ReplaceFlowController {
-
- private final StartDispatcher dispatcher;
-
- private final TaskService taskService;
- private final RuntimeService runtimeService;
- private final ProcessProgRefService processProgRefService;
-
- private final ApproveRecordService approveRecordService;
- private final FlowProgramFileService flowProgramFileService;
- private final DefaultFlowCompleteService defaultFlowCompleteService;
- private final TaskDispatchService taskDispatchService;
+ private final ProduceDivisionService produceDivisionService;
private final ReplaceFlowService replaceFlowService;
-
- @PostMapping("/prestart")
- @Operation(summary = "鍑嗗绋嬪簭鏇挎崲娴佺▼", description = "鍑嗗绋嬪簭鏇挎崲娴佺▼锛屾墦寮�鐣岄潰涔嬪墠璋冪敤锛岃皟鐢ㄤ箣鍚庝細鍒濆鍖栨枃浠跺垪琛�,")
- public R<String> prestart(@Parameter(description = "绋嬪簭鍖呭悕 鑺傜偣鐨刬d") Long nodeId) {
+ @PostMapping("/pre")
+ @Operation(summary = "鍑嗗绋嬪簭鏇挎崲娴佺▼new", description = "鍑嗗绋嬪簭鏇挎崲娴佺▼锛屾墦寮�鐣岄潰涔嬪墠璋冪敤锛岃皟鐢ㄤ箣鍚庝細鍒濆鍖栨枃浠跺垪琛�,")
+ public R<NcNodeVO> pre(@Parameter(description = "绋嬪簭鍖呭悕 鑺傜偣鐨刬d") Long nodeId) {
String tempInstanceId = "REP"+System.currentTimeMillis();
try {
- replaceFlowService.pre(nodeId,tempInstanceId);
- return R.data(tempInstanceId);
+ return R.data(replaceFlowService.pre(nodeId,tempInstanceId));
}catch(Exception e){
log.error("棰勫紑濮嬮敊璇�",e);
return R.fail(e.getMessage());
@@ -75,4 +69,23 @@
}
+
+ @PostMapping("/upload")
+ @Operation(summary = "鏇挎崲娴佺▼鍙戣捣涓婁紶绋嬪簭鏂囦欢", description = "鏇挎崲娴佺▼鍙戣捣涓婁紶绋嬪簭鏂囦欢")
+ public R<Boolean> upload(ReplaceUploadVO uploadVO) {
+ try {
+ replaceFlowService.uploadReplaceProgramFile(uploadVO);
+ }catch(Exception e) {
+ log.error("鏇挎崲绋嬪簭涓婁紶鎵ц閿欒",e);
+ return R.fail("涓婁紶澶辫触:" + e.getMessage());
+ }
+ return R.success();
+ }
+
+ @GetMapping("/default-assignees")
+ @Operation(summary = "榛樿鐨勫鏍哥敤鎴�", description = "鍑嗗绋嬪簭鏇挎崲娴佺▼锛屾墦寮�鐣岄潰涔嬪墠璋冪敤锛岃皟鐢ㄤ箣鍚庝細鍒濆鍖栨枃浠跺垪琛�,")
+ public R<ProduceDivision> defaultAssignees(@Parameter(description = "闆剁粍浠跺彿") String drawingNo) {
+ return R.data(produceDivisionService.getByDrawingNoWithQinzhe(drawingNo));
+
+ }
}
--
Gitblit v1.9.3