From 51dc7998dbcdce177755486a7dfa3c28c5da98f8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 29 六月 2020 10:04:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasLocTypeController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasLocTypeController.java b/src/main/java/com/zy/asrs/controller/BasLocTypeController.java
index 91ed94c..c32c0a6 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocTypeController.java
@@ -44,14 +44,15 @@
return R.ok(basLocTypeService.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);
}
}
}
@@ -71,7 +72,7 @@
}
@RequestMapping(value = "/basLocType/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鐘舵�佹坊鍔�")
public R add(BasLocType basLocType) {
basLocType.setModiUser(getUserId());
basLocType.setModiTime(new Date());
@@ -82,7 +83,7 @@
}
@RequestMapping(value = "/basLocType/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鐘舵�佷慨鏀�")
public R update(BasLocType basLocType){
if (Cools.isEmpty(basLocType) || null==basLocType.getLocSts()){
return R.error();
@@ -94,7 +95,7 @@
}
@RequestMapping(value = "/basLocType/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鐘舵�佸垹闄�")
public R delete(@RequestParam String param){
List<BasLocType> list = JSONArray.parseArray(param, BasLocType.class);
if (Cools.isEmpty(list)){
@@ -107,7 +108,7 @@
}
@RequestMapping(value = "/basLocType/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鐘舵�佸鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasLocType> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1