From e61f054bf5bf18c8a0095b0ee4b5ff0ea0f0d2f1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 20 三月 2025 14:42:30 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/RowLastnoController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RowLastnoController.java b/src/main/java/com/zy/asrs/controller/RowLastnoController.java
index 2ca05be..46c97b5 100644
--- a/src/main/java/com/zy/asrs/controller/RowLastnoController.java
+++ b/src/main/java/com/zy/asrs/controller/RowLastnoController.java
@@ -44,14 +44,15 @@
return R.ok(rowLastnoService.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);
}
}
}
@@ -71,7 +72,7 @@
@ManagerAuth
public R update(RowLastno rowLastno){
if (Cools.isEmpty(rowLastno) || null==rowLastno.getWhsType()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
rowLastno.setModiUser(getUserId());
rowLastno.setModiTime(new Date());
@@ -84,7 +85,7 @@
public R delete(@RequestParam String param){
List<RowLastno> list = JSONArray.parseArray(param, RowLastno.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (RowLastno entity : list){
rowLastnoService.delete(new EntityWrapper<>(entity));
--
Gitblit v1.9.1