From c7ecd3e8727f4b3029c17db1162785884fe30bce Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 23 三月 2026 14:03:47 +0800
Subject: [PATCH] 优化平库明细导出逻辑
---
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 612634e..6e254a7 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -15,7 +15,6 @@
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
-import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -26,6 +25,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -53,26 +54,14 @@
@RequestMapping(value = "/manLocDetl/export/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
public R export(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<ManLocDetl> 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<ManLocDetl> list = manLocDetlService.selectList(wrapper);
+ List<String> fields = param.getJSONArray("fields") == null
+ ? Collections.emptyList()
+ : JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> searchParam = param.getJSONObject("locDetl") == null
+ ? new HashMap<>()
+ : excludeTrash(param.getJSONObject("locDetl"));
+ String condition = searchParam.get("condition") == null ? null : String.valueOf(searchParam.remove("condition"));
+ List<ManLocDetl> list = manLocDetlService.selectList(buildWrapper(searchParam, condition));
return R.ok(exportSupport(list, fields));
}
@@ -130,11 +119,7 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
-
- EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(ManLocDetl.class, param.keySet(), wrapper, condition);
+ EntityWrapper<ManLocDetl> wrapper = buildWrapper(param, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(manLocDetlService.selectPage(new Page<>(curr, limit), wrapper));
@@ -191,5 +176,13 @@
}
}
+ private EntityWrapper<ManLocDetl> buildWrapper(Map<String, Object> param, String condition) {
+ EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(ManLocDetl.class, param.keySet(), wrapper, condition);
+ return wrapper;
+ }
+
}
--
Gitblit v1.9.1