From 8ca385d65454fb8e993970a768ed3ad5c3a095ab Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 18 一月 2025 13:44:44 +0800
Subject: [PATCH] 优化库位检索逻辑，修复代码并添加新功能
---
src/main/java/com/zy/asrs/controller/ReportDownloadController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportDownloadController.java b/src/main/java/com/zy/asrs/controller/ReportDownloadController.java
index d95f358..9261a94 100644
--- a/src/main/java/com/zy/asrs/controller/ReportDownloadController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportDownloadController.java
@@ -11,6 +11,7 @@
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.AgvWrkMastLogService;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +23,7 @@
import java.util.List;
import java.util.Map;
+@Slf4j
@RestController
@RequestMapping("/report/download")
public class ReportDownloadController extends BaseController {
@@ -182,14 +184,14 @@
* @since 2.1.1
*/
@RequestMapping("/out")
- public void out(HttpServletResponse response, @RequestParam(required = false) ViewWorkInBean bean) throws IOException {
+ public void out(HttpServletResponse response, @RequestParam(required = false) Map<String, Object> bean) throws IOException {
try {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
// 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
String fileName = URLEncoder.encode("鏃ュ嚭搴撴槑缁嗙粺璁�", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
- List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
+ List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(JSON.parseObject(JSON.toJSONString(bean), ViewWorkInBean.class));
// 杩欓噷闇�瑕佽缃笉鍏抽棴娴�
EasyExcel.write(response.getOutputStream(), ViewWorkInBean.class).autoCloseStream(Boolean.FALSE).sheet("sheet1").doWrite(list);
} catch (Exception e) {
@@ -211,15 +213,15 @@
* @since 2.1.1
*/
@RequestMapping("/in")
- public void in(HttpServletResponse response, @RequestParam(required = false) ViewWorkInBean bean) throws IOException {
+ public void in(HttpServletResponse response, @RequestParam(required = false) Map<String, Object> bean) throws IOException {
try {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
// 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
String fileName = URLEncoder.encode("鏃ュ叆搴撴槑缁嗙粺璁�", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
- List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
- String s = "1";
+ ViewWorkInBean viewWorkInBean = JSON.parseObject(JSON.toJSONString(bean), ViewWorkInBean.class);
+ List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(viewWorkInBean);
// 杩欓噷闇�瑕佽缃笉鍏抽棴娴�
EasyExcel.write(response.getOutputStream(), ViewWorkInBean.class).autoCloseStream(Boolean.FALSE).sheet("sheet1").doWrite(list);
} catch (Exception e) {
--
Gitblit v1.9.1