From 32bb782c3ff2dee184e485f1ebd71c10313571a1 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 10 七月 2021 16:13:53 +0800
Subject: [PATCH] 1.平仓库存管理新增导出功能

---
 src/main/java/com/zy/asrs/controller/LocNormalController.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 914cb9b..30c9cd1 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -174,6 +174,19 @@
         return R.ok("鎴愬姛瀵煎叆" + listener.getTotal() + "鏉$墿鏂欎俊鎭�");
     }
 
+    /* 瀵煎嚭 */
+    @RequestMapping(value = "/locNormal/export/auth")
+    @ManagerAuth(memo = "骞充粨绠$悊瀵煎嚭")
+    public R export(@RequestBody JSONObject param){
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        EntityWrapper<LocNormal> wrapper = new EntityWrapper<LocNormal>();
+        wrapper.ne("state", "3");
+        Map<String, Object> map = excludeTrash(param.getJSONObject("exportData"));
+        convert(map, wrapper);
+        List<LocNormal> list = locNormalService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
     /* 骞充粨鍏ュ簱 鎴愬搧 */
     @RequestMapping(value = "/locNormal/in")
     @ManagerAuth(memo = "骞充粨鍏ュ簱")
@@ -304,4 +317,14 @@
         allLike(LocNormalLog.class, param.keySet(), wrapper, condition);
         return R.ok(locNormalLogService.selectPage(new Page<>(curr, limit), wrapper));
     }
+
+    //excel瀵煎嚭
+    @RequestMapping("/locNomal/normalReportExport.action")
+    @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
+    public R normalReportExport(@RequestBody JSONObject param){
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        @SuppressWarnings("unchecked")
+        List<LocNormalReport> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), LocNormalReport.class);
+        return R.ok(exportSupport(list, fields));
+    }
 }

--
Gitblit v1.9.1