From 8ca385d65454fb8e993970a768ed3ad5c3a095ab Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 18 一月 2025 13:44:44 +0800
Subject: [PATCH] 优化库位检索逻辑，修复代码并添加新功能
---
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index a99fd29..51cb1eb 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -44,14 +44,15 @@
return R.ok(basWrkStatusService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -60,7 +61,7 @@
@ManagerAuth
public R edit(BasWrkStatus basWrkStatus) {
if (Cools.isEmpty(basWrkStatus)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
if (null == basWrkStatus.getWrkSts()){
basWrkStatusService.insert(basWrkStatus);
@@ -85,7 +86,7 @@
@ManagerAuth(memo = "宸ヤ綔鐘舵�佷慨鏀�")
public R update(BasWrkStatus basWrkStatus){
if (Cools.isEmpty(basWrkStatus) || null==basWrkStatus.getWrkSts()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
basWrkStatus.setModiUser(getUserId());
basWrkStatus.setModiTime(new Date());
@@ -98,7 +99,7 @@
public R delete(@RequestParam String param){
List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (BasWrkStatus entity : list){
basWrkStatusService.delete(new EntityWrapper<>(entity));
--
Gitblit v1.9.1