From 7045b984af43d5825058b4df4b4dbc7a08cf2db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:33:53 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 4a7c5f2..713da44 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -104,26 +104,11 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
-// String row = "";
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
-// if (param.get("row") != null) {
-// String chooseRow = (String) param.get("row");
-// if (chooseRow.length() == 1) {
-// row = "0" + chooseRow;
-// param.remove("row");
-// }else {
-// row = chooseRow;
-// param.remove("row");
-// }
-// }
excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
-// if (!row.equals("")){
-// wrapper.and()
-// .where("loc_no like '" +row +"%'");
-// }
return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -204,6 +189,14 @@
.where("loc_no like '" +row +"%'");
}
List<LocDetl> list = locDetlService.selectList(wrapper);
+ for (LocDetl item : list) {
+ if (item.getSpecs() != null) {
+ item.setSpecs(item.getSpecs().replace("\"", "\"\"")); // 杞箟鍙屽紩鍙�
+ }
+ if (item.getBrand() != null) {
+ item.setBrand(item.getBrand().replace("\"", "\"\""));
+ }
+ }
return R.ok(exportSupport(list, fields));
}
--
Gitblit v1.9.1