From f67aa8b146f0fa901ce4ae183be511d8615cde77 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 14:49:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
index a657183..d684093 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
@@ -7,10 +7,7 @@
import com.ruoyi.process.service.ProcessReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
@@ -32,7 +29,7 @@
private ProcessReportService processReportService;
@ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婂彂鏀剧櫥璁板垪琛�")
- @PostMapping("/pageProcessReport")
+ @GetMapping("/pageProcessReport")
public Result pageProcessReport(ProcessReport processReport , Page page) throws Exception {
return Result.success(processReportService.pageProcessReport(page, processReport));
}
@@ -44,13 +41,13 @@
}
@ApiOperation(value = "鍒犻櫎妫�楠屾姤鍛婂彂鏀剧櫥璁�")
- @PostMapping("/delProcessReport")
+ @DeleteMapping("/delProcessReport")
public Result delProcessReport(Long id) {
return Result.success(processReportService.removeById(id));
}
@ApiOperation(value = "鏌ョ湅妫�楠屾姤鍛婂彂鏀剧櫥璁拌鎯�")
- @PostMapping("/getProcessReport")
+ @GetMapping("/getProcessReport")
public Result getProcessReport(Long id) {
return Result.success(processReportService.getById(id));
}
@@ -62,9 +59,9 @@
}
@ApiOperation(value = "瀵煎嚭妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃")
- @PostMapping("/exportProcessReport")
- public Result exportProcessReport(@RequestBody ProcessReportDto processReportDto) {
- return Result.success(processReportService.exportProcessReport(processReportDto.getIds()));
+ @GetMapping("/exportProcessReport")
+ public Result exportProcessReport() {
+ return Result.success(processReportService.exportProcessReport());
}
}
--
Gitblit v1.9.3