From f206c80520a83a28b3caa91a3fbbd9d039dd8456 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 22 四月 2025 16:10:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java
index 0349c89..53f54a3 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessSampleController.java
@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -29,32 +30,27 @@
@ApiOperation(value = "鏌ヨ鏍峰搧鎺ユ敹璇︽儏")
@GetMapping("/pageProcessSample")
- public Result pageProcessSample(ProcessSample processSample, Page page) throws Exception {
+ public Result pageProcessSample(ProcessSample processSample, Page page){
return Result.success(processSampleService.pageProcessSample(page, processSample));
}
@ApiOperation(value = "鏂板鏍峰搧鎺ユ敹璇︽儏")
@PostMapping("/addProcessSample")
public Result addProcessSample(@RequestBody ProcessSample processSample) {
- return Result.success(processSampleService.addProcessSample(processSample));
+ return Result.success(processSampleService.saveOrUpdate(processSample));
}
@ApiOperation(value = "鍒犻櫎鏍峰搧鎺ユ敹")
@DeleteMapping("/delProcessSample")
public Result delProcessSample(Integer id) {
- return Result.success(processSampleService.delProcessSample(id));
+ return Result.success(processSampleService.removeById(id));
}
- @ApiOperation(value = "淇敼鏍峰搧鎺ユ敹")
- @PostMapping("/doProcessSample")
- public Result doProcessSample(@RequestBody ProcessSample processSample) {
- return Result.success(processSampleService.doProcessSample(processSample));
- }
- @ApiOperation(value = "鏌ョ湅鏍峰搧鎺ユ敹")
- @GetMapping("/getProcessSample")
- public Result getProcessSample(Integer id) {
- return Result.success(processSampleService.getById(id));
+ @ApiOperation(value = "瀵煎嚭鏍峰搧鎺ユ敹")
+ @GetMapping("/exportProcessSample")
+ public void exportProcessSample(ProcessSample processSample, HttpServletResponse response) {
+ processSampleService.exportProcessSample(processSample,response);
}
--
Gitblit v1.9.3