From d8df3264fb0461d5c4706a3026663e7db1b81ba7 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期一, 09 十月 2023 10:29:36 +0800
Subject: [PATCH] #补丁
---
src/main/webapp/static/js/locDetl/locDetl.js | 2 +-
src/main/java/com/zy/asrs/controller/LocDetlController.java | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 77d49d2..944a213 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -241,6 +241,31 @@
}
return R.ok(exportSupport(result, fields));
}
+ @RequestMapping(value = "/locDetl/export/auth/v2")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R exportV2(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
+ String row = "";
+ if (map.get("row") != null) {
+ String chooseRow = (String) map.get("row");
+ if (chooseRow.length() == 1) {
+ row = "0" + chooseRow;
+ map.remove("row");
+ } else {
+ row = chooseRow;
+ map.remove("row");
+ }
+ }
+ convert(map, wrapper);
+ if (!row.equals("")) {
+ wrapper.and()
+ .where("loc_no like '" + row + "%'");
+ }
+ List<LocDetl> list = locDetlService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
@RequestMapping(value = "/locDetlQuery/auth")
@ManagerAuth
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 42f0e3b..86b8f69 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -199,7 +199,7 @@
};
var loadIndex = layer.msg('姝ｅ湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
$.ajax({
- url: baseUrl+"/locDetl/export/auth",
+ url: baseUrl+"/locDetl/export/auth/v2",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
--
Gitblit v1.9.1