From a66b19e1c09201a922735c2325ca04df7fe544af Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:58 +0800
Subject: [PATCH] 空校验；提高代码的健壮性
---
src/main/java/com/zy/asrs/controller/AdjDetlController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AdjDetlController.java b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
index dfc2cbc..9a670d9 100644
--- a/src/main/java/com/zy/asrs/controller/AdjDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
@@ -44,19 +44,21 @@
excludeTrash(param);
EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ wrapper.orderBy("appe_time",false);
allLike(AdjDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "desc".equals(orderByType));}
return R.ok(adjDetlService.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.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -72,7 +74,7 @@
@ManagerAuth
public R update(AdjDetl adjDetl){
if (Cools.isEmpty(adjDetl) || null==adjDetl.getAdjId()){
- return R.error();
+ return R.error("璇锋眰鍙傛暟涓虹┖");
}
adjDetlService.updateById(adjDetl);
return R.ok();
@@ -83,7 +85,7 @@
public R delete(@RequestParam String param){
List<AdjDetl> list = JSONArray.parseArray(param, AdjDetl.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("璇锋眰鍙傛暟涓虹┖");
}
for (AdjDetl entity : list){
adjDetlService.delete(new EntityWrapper<>(entity));
--
Gitblit v1.9.1