From 9c483e9be881783af14ad68906e78ee557005eb4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 22:01:45 +0800
Subject: [PATCH] 修复dnc导出无header问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 38 ++++++++++----------------------------
1 files changed, 10 insertions(+), 28 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 0c651c6..5200df1 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
@@ -67,19 +67,23 @@
return R.<Boolean>status(true);
}
+ @PostMapping("/lock")
+ @Operation(summary = "閿佸畾鑺傜偣(绋嬪簭鍖呭悕)")
+ public R<Boolean> lock(@Parameter(description="绋嬪簭鍖呭悕鑺傜偣id)")Long id) {
+ ncNodeService.lock(id);
+ return R.<Boolean>status(true);
+ }
+
@GetMapping("/lazy-list")
@Operation(summary = "鎳掑姞杞藉垪琛�", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯")
public R<List<NcNodeVO>> lazyList(Long parentId) {
List<NcNodeVO> list = ncNodeService.lazyList(parentId);
if(list != null && !list.isEmpty()) {
for(NcNodeVO ncNodeVO : list) {
- if(!"60".equals(ncNodeVO.getNodeType())){
- break;
+ if(NcNode.TYPE_PROGRAM_PACKAGE.equals(ncNodeVO.getNodeType())){
+ ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
}
- ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
-
}
-
}
return R.data(list);
}
@@ -91,28 +95,7 @@
return R.fail("璇疯緭鍏ュ悕绉�");
}
List<NcNodeVO> list = ncNodeService.searchList(queryVO);
- /*
- if(list != null && !list.isEmpty()) {
- for(NcNodeVO ncNodeVO : list) {
- if(!"70".equals(ncNodeVO.getNodeType())){
- break;
- }
- NcProgram program = ncProgramService.getByBindNodeId(ncNodeVO.getId());
- if(program != null) {
- ncNodeVO.setProcessEdition(program.getProcessEdition());
- ncNodeVO.setDrawingNo(program.getDrawingNo());
- ncNodeVO.setMachineCode(program.getMachineCode());
- ncNodeVO.setProcessName(program.getProcessName());
- ncNodeVO.setVersionNumber(program.getVersionNumber());
- //record涓壘涓嶅埌鏃舵湭鍚姩0锛涙壘鍒颁簡闇�瑕佹煡璇㈡祦绋嬪疄渚媔d锛屾槸鍚﹁繍琛屼腑
- ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(program.getId()));
- }
- }
-
- }
-
- */
return R.data(list);
}
@@ -131,10 +114,9 @@
NcNode node2 = ncNodeService.getById(id2);
if(node1.getFlowProgramFileId() != null) {
vo.setContent1(flowProgramFileService.getFileContent(node1.getFlowProgramFileId()));
-
}
if(node2.getFlowProgramFileId() != null) {
- vo.setContent1(flowProgramFileService.getFileContent(node2.getFlowProgramFileId()));
+ vo.setContent2(flowProgramFileService.getFileContent(node2.getFlowProgramFileId()));
}
return R.data(vo);
--
Gitblit v1.9.3