From 7d56f2a7c8b3907ecf7ff74a1f9a20b977c3adf8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 08 七月 2025 20:21:10 +0800
Subject: [PATCH] 调整审批记录的保存方式
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 334bda0..bd6f030 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
@@ -1,7 +1,7 @@
package org.springblade.mdm.program.controller;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@@ -10,15 +10,17 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.secure.BladeUser;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
+import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.program.service.NcNodeService;
+import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
+import org.springblade.mdm.program.vo.NcNodeProgramVO;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 绋嬪簭鑺傜偣
@@ -49,7 +51,7 @@
@PostMapping("/update")
@Operation(summary = "淇敼鑺傜偣", description = "鑺傜偣淇℃伅,蹇呴』浼犲叆ID")
public R<Boolean> update(@RequestBody NcNodeVO vo) {
- ncNodeService.updateNcCode(vo);
+ ncNodeService.updateNcNode(vo);
return R.<Boolean>status(true);
}
@@ -61,14 +63,19 @@
}
@GetMapping("/lazy-list")
- @Parameters({
- @Parameter(name = "deptName", description = "閮ㄩ棬鍚嶇О", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
- @Parameter(name = "fullName", description = "閮ㄩ棬鍏ㄧО", in = ParameterIn.QUERY, schema = @Schema(type = "string"))
- })
-
@Operation(summary = "鎳掑姞杞藉垪琛�", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯")
public R<List<NcNodeVO>> lazyList(Long parentId) {
List<NcNodeVO> list = ncNodeService.lazyList(parentId);
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);
+ }
+*/
+
}
--
Gitblit v1.9.3