From 2072003ebd2e620f3ab9c22a87a6515684b0cb8d Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Mon, 11 May 2026 09:50:09 +0800
Subject: [PATCH] 功能增加
---
src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java b/src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java
index 52d5f77..77583dd 100644
--- a/src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java
+++ b/src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java
@@ -20,7 +20,9 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream;
+import java.io.IOException;
/**
* 风险评价因子
@@ -110,7 +112,7 @@
}
@PostMapping("/insert/importOldRiskAssess")
- public Result importOldRiskAssess(@RequestParam("file") MultipartFile file){
+ public Result importOldRiskAssess(@RequestParam("file") MultipartFile file) throws IOException {
Result result = new Result();
result.setCode(ResultCode.OK);
@@ -134,20 +136,21 @@
}
@PostMapping("/select/exportOldRiskAssess")
- public Result exportOldRiskAssess(@RequestBody OldRiskAssessQueryReqBO queryReqDO){
+ public Result exportOldRiskAssess(@RequestBody OldRiskAssessQueryReqBO queryReqDO, HttpServletResponse response, HttpServletRequest request){
Result result = new Result();
result.setCode(ResultCode.OK);
result.setMsg("导出成功");
- int importResult = oldRiskAssessService.exportOldRiskAssess(getCurrentUserId(), queryReqDO);
+ Result<OldRiskAssessExportRespDTO> importResult = oldRiskAssessService.exportOldRiskAssess(getCurrentUserId(), queryReqDO, response, request);
- if (importResult < 1){
- result.setCode(ResultCode.NOT_OK);
- result.setMsg("导出失败");
- }
- result.setCount(importResult);
+// if (importResult < 1){
+// result.setCode(ResultCode.NOT_OK);
+// result.setMsg("导出失败");
+// }
+ result.setCount(importResult.getCount());
+ result.setData(importResult.getData());
return result;
}
--
Gitblit v1.9.2