From c65db22f67af8018ae7105ea00d8743e42835e13 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 29 三月 2025 15:52:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/WrkLastnoController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
index 45585ff..8c48b6a 100644
--- a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
@@ -44,20 +44,21 @@
return R.ok(wrkLastnoService.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);
}
}
}
@RequestMapping(value = "/wrkLastno/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔搴忓彿娣诲姞")
public R add(WrkLastno wrkLastno) {
wrkLastno.setModiUser(getUserId());
wrkLastno.setModiTime(new Date());
@@ -68,10 +69,10 @@
}
@RequestMapping(value = "/wrkLastno/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔搴忓彿淇敼")
public R update(WrkLastno wrkLastno){
if (Cools.isEmpty(wrkLastno) || null==wrkLastno.getWrkMk()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
wrkLastno.setModiUser(getUserId());
wrkLastno.setModiTime(new Date());
@@ -80,11 +81,11 @@
}
@RequestMapping(value = "/wrkLastno/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔搴忓彿鍒犻櫎")
public R delete(@RequestParam String param){
List<WrkLastno> list = JSONArray.parseArray(param, WrkLastno.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (WrkLastno entity : list){
wrkLastnoService.delete(new EntityWrapper<>(entity));
@@ -93,7 +94,7 @@
}
@RequestMapping(value = "/wrkLastno/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔搴忓彿瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1