From a7426b81b0bd5b4bb1ed68fd6ecb98f405def280 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 17:47:07 +0800
Subject: [PATCH] dnc导出还没测
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 3bdbf63..6aa1ec1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -19,10 +19,7 @@
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
-import org.springblade.mdm.program.vo.NcNodeProgramVO;
-import org.springblade.mdm.program.vo.NcNodeQueryVO;
-import org.springblade.mdm.program.vo.NcNodeVO;
+import org.springblade.mdm.program.vo.*;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -73,9 +70,11 @@
List<NcNodeVO> list = ncNodeService.lazyList(parentId);
if(list != null && !list.isEmpty()) {
for(NcNodeVO ncNodeVO : list) {
- if(!"70".equals(ncNodeVO.getNodeType())){
+ if(!"60".equals(ncNodeVO.getNodeType())){
break;
}
+ ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
+ /*
NcProgram program = ncProgramService.getByBindNodeId(ncNodeVO.getId());
if(program != null) {
ncNodeVO.setProcessEdition(program.getProcessEdition());
@@ -86,7 +85,7 @@
//record涓壘涓嶅埌鏃舵湭鍚姩0锛涙壘鍒颁簡闇�瑕佹煡璇㈡祦绋嬪疄渚媔d锛屾槸鍚﹁繍琛屼腑
ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(program.getId()));
- }
+ }*/
}
}
@@ -125,13 +124,10 @@
return R.data(list);
}
- /*
- @Operation(summary = "绋嬪簭鍒嗛〉鏌ヨ", description = "鐢ㄤ簬鍦ㄧ紪鍒惰妭鐐归�夋嫨娴佺▼瀵瑰簲鐨勭▼搴�")
- @GetMapping("/programpickpage")
- public R<IPage<NcNodeProgramVO>> page(NcNodeProgramQueryVO query) {
- IPage<NcNodeProgramVO> pages = ncNodeService.programPageQuery(query);
- return R.data(pages);
+ @GetMapping("/history-by-nodeid")
+ @Operation(summary = "鏍规嵁缁戝畾鑺傜偣id鑾峰彇鍘嗗彶鍒楄〃", description = "绋嬪簭鍘嗗彶鍒楄〃锛屼粎鈥樼▼搴忓寘鈥欏瓧鍏稿��70鐨勬暟鎹�傜敤浜庢樉绀虹▼搴忕殑鈥樺巻鍙茬増鏈��")
+ public R<List<NcNodeVO>> historyByBindNodeId(@Parameter(description="鑺傜偣ID(nodeType=70鐨勮妭鐐筰d)")@RequestParam Long id) {
+ return R.data(this.ncNodeService.historyByNodeId(id));
}
-*/
}
--
Gitblit v1.9.3