From ac2289e0781424f488655ad1773bd365164fe5c7 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期一, 18 八月 2025 10:14:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index e8c3fbe..b772947 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -44,14 +44,15 @@
return R.ok(basCrnpService.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);
}
}
}
@@ -129,4 +130,18 @@
return R.ok();
}
+ @GetMapping("/basCrnp/getCrnInfoList")
+ public R getCrnInfoList() {
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>());
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ for (BasCrnp basCrnp : basCrnps) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("crnNo", basCrnp.getCrnNo());
+ map.put("error", basCrnp.getCrnErr());
+ map.put("errorMsg", basCrnp.getCrnErr$());
+ list.add(map);
+ }
+ return R.ok().add(list);
+ }
+
}
--
Gitblit v1.9.1