From 0c0cd17fb9162c0c949c354adcd422d605aad7b9 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 15 四月 2024 16:11:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 59dfbe0..4a2a9ac 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -128,7 +128,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.eq(entry.getKey(), val);
}
}
}
@@ -173,14 +173,25 @@
@RequestMapping(value = "/orderDetlQuery/auth")
@ManagerAuth
public R query(String condition) {
+
+ if(condition.split(",").length < 2){
+ return R.ok();
+ }
+
+ String maktxCondition = condition.split(",")[0];
+ Long orderId = Long.parseLong(condition.split(",")[1]);
+
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
+ wrapper.eq("order_id",orderId);
+ wrapper.like("maktx", maktxCondition);
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (OrderDetl orderDetl : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", orderDetl.getId());
- map.put("value", orderDetl.getId());
+ map.put("value", orderDetl.getMaktx());
+ map.put("weight",orderDetl.getAnfme() - orderDetl.getWorkQty());
+ map.put("type","orderDetl");
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1