From 964f4c0c941b62daef96d1326741d8d576bf0098 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 06 七月 2020 15:53:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/StaDescController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 7e7d659..5c32944 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -44,14 +44,15 @@
return R.ok(staDescService.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);
}
}
}
@@ -70,7 +71,7 @@
@RequestMapping(value = "/staDesc/update/auth")
@ManagerAuth(memo = "绔欑偣璺緞淇敼")
public R update(StaDesc staDesc){
- if (Cools.isEmpty(staDesc) || null==staDesc.getCrnNo()){
+ if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){
return R.error();
}
staDesc.setModiUser(getUserId());
--
Gitblit v1.9.1