From fb57e7836338304b16c09fec4fb5c68fb688c39e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 14:03:24 +0800
Subject: [PATCH] 1.新增分区查询 2.任务档新增分区字段
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 026a1c2..c8dc328 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -22,6 +22,7 @@
import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
@@ -43,6 +44,9 @@
private LocDetlMapper locDetlMapper;
@Autowired
private MatService matService;
+
+ @Autowired
+ private LocMastService locMastService;
@Autowired
private LocOwnerService locOwnerService;
@@ -209,8 +213,13 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- if (entry.getKey().equals("locNo")) {
- wrapper.like("loc_no", String.valueOf(entry.getValue()));
+ if (entry.getKey().equals("locNo") || entry.getKey().equals("loc_no")) {
+ List<String> locNos = locMastService.selectLocNosByNoOrAlias(String.valueOf(entry.getValue()));
+ if (locNos.isEmpty()) {
+ wrapper.eq("loc_no", "__NO_MATCH__");
+ } else {
+ wrapper.in("loc_no", locNos);
+ }
} else {
wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
}
--
Gitblit v1.9.1