From 487c8086116b9f0d811eca37860822ce9e445d99 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 28 十月 2025 11:13:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index 9962ec2..f167ccf 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -34,24 +34,27 @@
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false, defaultValue = "stsNo")String orderByField,
+ @RequestParam(required = false, defaultValue = "asc")String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("sts_no", true);
+ }
return R.ok(basCrnStatusService.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);
}
}
}
@@ -108,7 +111,7 @@
public R query(String condition) {
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
wrapper.like("sts_desc", condition);
- Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasCrnStatus basCrnStatus : page.getRecords()){
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.9.1