From 1c3c68d3dc45e4d519088de17001284858de5eb9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 六月 2020 10:50:02 +0800
Subject: [PATCH] #导出

---
 src/main/java/com/zy/asrs/controller/MatCodeController.java |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index eb80c17..b36c779 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -101,18 +101,10 @@
 
     // 瀵煎嚭
     @RequestMapping(value = "/matCode/export/auth")
-    @ManagerAuth
-    public void export(@RequestBody JSONObject param, HttpServletResponse response) throws Exception{
-//        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
-//        EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
-//        Map<String, Object> map = excludeTrash(param.getJSONObject("matCode"));
-//        convert(map, wrapper);
-//        List<MatCode> list = matCodeService.selectList(wrapper);
-
-
+    public void export(@RequestParam(required = false) String fileName,
+                       @RequestParam(required = false) Integer rowCount,
+                       HttpServletResponse response) throws Exception {
         List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
-
-
         List<MatCodeExcel> excels = new ArrayList<>();
         for (MatCode matCode : list) {
             MatCodeExcel excel = new MatCodeExcel();
@@ -122,12 +114,15 @@
             excel.setStr1(matCode.getStr1());
             excel.setStr2(matCode.getStr2());
             excels.add(excel);
+            if (rowCount != null && excels.size() >= rowCount){
+                break;
+            }
         }
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("娴嬭瘯", "UTF-8");
+        fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鐗╂枡缂栫爜":fileName, "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
-        EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("妯℃澘").doWrite(excels);
+        EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("琛�1").doWrite(excels);
     }
 
     // 瀵煎叆

--
Gitblit v1.9.1