From 371462edc6b3ee1de97c235d4a019b544badda0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 14 二月 2026 22:09:37 +0800
Subject: [PATCH] AGV工作档界面和逻辑调整
---
src/main/java/com/zy/asrs/controller/TaskLogController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskLogController.java b/src/main/java/com/zy/asrs/controller/TaskLogController.java
index 440c4ee..d7a8c1e 100644
--- a/src/main/java/com/zy/asrs/controller/TaskLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskLogController.java
@@ -65,7 +65,6 @@
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- // 璺宠繃绌哄�煎拰 "null" 瀛楃涓�
if (Cools.isEmpty(val) || "null".equals(val)) {
continue;
}
@@ -73,6 +72,23 @@
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else if (val.contains(",") && !val.equals("null")) {
+ // 澶氬�兼煡璇細宸ヤ綔鐘舵�佺瓑澶氶�夌敤 IN锛堜笌 AGV 浠诲姟绠＄悊涓�鑷达級
+ String[] values = val.split(",");
+ List<Object> valueList = new ArrayList<>();
+ for (String v : values) {
+ v = v.trim();
+ if (!Cools.isEmpty(v) && !v.equals("null")) {
+ try {
+ valueList.add(Long.parseLong(v));
+ } catch (NumberFormatException e) {
+ valueList.add(v);
+ }
+ }
+ }
+ if (!valueList.isEmpty()) {
+ wrapper.in(entry.getKey(), valueList);
+ }
} else {
wrapper.like(entry.getKey(), val);
}
--
Gitblit v1.9.1