From 1c52e77d77d0e924a1df0725c0748afde172ad68 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
index dc137e8..8456b16 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
@@ -10,6 +10,7 @@
import com.ruoyi.process.pojo.ProcessMethodSearchNew;
import com.ruoyi.process.pojo.ProcessMethodSearchNewArchived;
import com.ruoyi.process.pojo.ProcessMethodSearchNewBackups;
+import com.ruoyi.process.pojo.ProcessMethodSearchNewHistory;
import com.ruoyi.process.service.ProcessMethodSearchNewService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -59,6 +60,15 @@
}
/**
+ * 鍒犻櫎鏍囧噯鏌ユ柊
+ */
+ @Operation(summary = "鍒犻櫎鏍囧噯鏌ユ柊")
+ @DeleteMapping("/delMethodSearchNew")
+ public Result delMethodSearchNew(Integer methodSearchNewId) {
+ return Result.success(processMethodSearchNewService.delMethodSearchNew(methodSearchNewId));
+ }
+
+ /**
* 鏍囧噯鏌ユ柊鍒楄〃
*/
@Operation(summary = "鏍囧噯鏌ユ柊鍒楄〃")
@@ -67,10 +77,17 @@
return Result.success(processMethodSearchNewService.pageMethodSearchNew(page, processMethodSearchNew));
}
- @Operation(summary = "鑷姩褰掓。璁板綍鍒楄〃")
- @GetMapping("/pageAutoArchived")
- public Result<IPage<ProcessMethodSearchNew>> pageAutoArchived(ProcessMethodSearchNew processMethodSearchNew, Page page) {
- return Result.success(processMethodSearchNewService.pageAutoArchived(page, processMethodSearchNew));
+ @Operation(summary = "鏌ヨ鍘嗘鏍囧噯鏌ユ柊璁板綍")
+ @GetMapping("/listSearchNewHistory")
+ public Result<List<ProcessMethodSearchNewHistory>> listSearchNewHistory(Integer methodSearchNewId) {
+ return Result.success(processMethodSearchNewService.listSearchNewHistory(methodSearchNewId));
+ }
+
+ @Operation(summary = "鍒嗛〉鏌ヨ鍏ㄩ儴鏌ユ柊璁板綍")
+ @GetMapping("/pageSearchNewHistory")
+ public Result<IPage<ProcessMethodSearchNewHistory>> pageSearchNewHistory(
+ Page<ProcessMethodSearchNewHistory> page, String standardNo) {
+ return Result.success(processMethodSearchNewService.pageSearchNewHistory(page, standardNo));
}
@Operation(summary = "鏍囧噯鏌ユ柊瀵煎嚭")
--
Gitblit v1.9.3