From dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 23 十二月 2024 15:45:11 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/controller/AdjDetlController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..afc9c24 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);
}
}
}
--
Gitblit v1.9.1