From 4660b2e57c53fa6b798c104abbe4a6b0ad4b6a97 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 18:50:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzwms2' into phyzwms2
---
src/main/java/com/zy/asrs/controller/ReportDownloadController.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportDownloadController.java b/src/main/java/com/zy/asrs/controller/ReportDownloadController.java
index 79b80a2..e36cb0c 100644
--- a/src/main/java/com/zy/asrs/controller/ReportDownloadController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportDownloadController.java
@@ -8,7 +8,9 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.AgvWrkMastLog;
+import com.zy.asrs.entity.ViewInOutBean;
import com.zy.asrs.entity.ViewWorkCountInView;
+import com.zy.asrs.entity.ViewWorkInBean;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.AgvWrkMastLogService;
import com.zy.common.web.BaseController;
@@ -41,7 +43,7 @@
*
* @since 2.1.1
*/
- @GetMapping("/in")
+ @GetMapping("/countIn")
public void download1(HttpServletResponse response,
@RequestParam Map<String, Object> param) throws IOException {
try {
@@ -85,7 +87,7 @@
*
* @since 2.1.1
*/
- @RequestMapping("/out")
+ @RequestMapping("/countOut")
public void download2(HttpServletResponse response,
@RequestParam Map<String, Object> param) throws IOException {
try {
@@ -178,4 +180,67 @@
}
}
}
+
+
+ /**
+ * 鏂囦欢涓嬭浇骞朵笖澶辫触鐨勬椂鍊欒繑鍥瀓son锛堥粯璁ゅけ璐ヤ簡浼氳繑鍥炰竴涓湁閮ㄥ垎鏁版嵁鐨凟xcel锛�
+ * 鏃ュ嚭搴撴槑缁嗙粺璁�
+ *
+ * @since 2.1.1
+ */
+ @RequestMapping("/out")
+ public void out(HttpServletResponse response,
+ @RequestParam ViewWorkInBean 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);
+ // 杩欓噷闇�瑕佽缃笉鍏抽棴娴�
+ EasyExcel.write(response.getOutputStream(), ViewWorkCountInView.class).autoCloseStream(Boolean.FALSE).sheet("sheet1")
+ .doWrite(list);
+ } catch (Exception e) {
+ // 閲嶇疆response
+ response.reset();
+ response.setContentType("application/json");
+ response.setCharacterEncoding("utf-8");
+ Map<String, String> map = new HashMap<>();
+ map.put("status", "failure");
+ map.put("message", "涓嬭浇鏂囦欢澶辫触" + e.getMessage());
+ response.getWriter().println(JSON.toJSONString(map));
+ }
+ }
+
+ /**
+ * 鏂囦欢涓嬭浇骞朵笖澶辫触鐨勬椂鍊欒繑鍥瀓son锛堥粯璁ゅけ璐ヤ簡浼氳繑鍥炰竴涓湁閮ㄥ垎鏁版嵁鐨凟xcel锛�
+ * 鏃ュ叆搴撴槑缁嗙粺璁�
+ *
+ * @since 2.1.1
+ */
+ @RequestMapping("/in")
+ public void in(HttpServletResponse response,
+ @RequestParam ViewWorkInBean 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);
+ // 杩欓噷闇�瑕佽缃笉鍏抽棴娴�
+ EasyExcel.write(response.getOutputStream(), ViewWorkCountInView.class).autoCloseStream(Boolean.FALSE).sheet("sheet1")
+ .doWrite(list);
+ } catch (Exception e) {
+ // 閲嶇疆response
+ response.reset();
+ response.setContentType("application/json");
+ response.setCharacterEncoding("utf-8");
+ Map<String, String> map = new HashMap<>();
+ map.put("status", "failure");
+ map.put("message", "涓嬭浇鏂囦欢澶辫触" + e.getMessage());
+ response.getWriter().println(JSON.toJSONString(map));
+ }
+ }
}
--
Gitblit v1.9.1