From 55d0c99711a25033b6a438954ca0c83a5263d986 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 21 四月 2025 16:24:39 +0800
Subject: [PATCH] 7.4样品的处置

---
 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