From 3ea61dd8477c0e652ff660aabbd11a11cdf63a45 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 15 五月 2024 09:56:55 +0800
Subject: [PATCH] 导出调整
---
src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..a3acaa4 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,6 +20,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream;
/**
@@ -134,20 +135,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