From 234b0ac195934b34c06045b2d2ef0f10e239dd8e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 23 四月 2025 00:06:54 +0800
Subject: [PATCH] 系统合并
---
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 fb79222..76a2db2 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
@@ -10,14 +10,18 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
* 妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-05 08:58:39
*/
@RestController
@@ -30,7 +34,7 @@
@ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婂彂鏀剧櫥璁板垪琛�")
@GetMapping("/pageProcessReport")
- public Result pageProcessReport(ProcessReport processReport , Page page) throws Exception {
+ public Result pageProcessReport(ProcessReport processReport , Page page) {
return Result.success(processReportService.pageProcessReport(page, processReport));
}
@@ -60,8 +64,11 @@
@ApiOperation(value = "瀵煎嚭妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃")
@GetMapping("/exportProcessReport")
- public Result exportProcessReport(ProcessReportDto processReportDto) {
- return Result.success(processReportService.exportProcessReport(processReportDto.getIds()));
+ public void exportProcessReport(String ids, HttpServletResponse response) {
+ List<Integer> list = Arrays.stream(ids.split(","))
+ .map(Integer::parseInt)
+ .collect(Collectors.toList());
+ processReportService.exportProcessReport(list, response);
}
}
--
Gitblit v1.9.3