From 67da83c698e77ccf178669a31e4bd3a4e8fc1ca7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 03 八月 2021 16:10:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 36261c9..548b811 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 = "骞充粨鍏ュ簱")
@@ -311,7 +324,7 @@
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);
+ List<LocNormalLog> list = JSONObject.parseArray(param.getJSONArray("exportData").toJSONString(), LocNormalLog.class);
return R.ok(exportSupport(list, fields));
}
}
--
Gitblit v1.9.1