From 941bf6ff9bb24315dce4b9e39fb370b9fa766842 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 18 二月 2025 12:35:35 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
index 1fe1e13..e96e6c0 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
@@ -44,14 +44,15 @@
return R.ok(basWrkIotypeService.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);
}
}
}
@@ -60,7 +61,7 @@
@ManagerAuth
public R edit(BasWrkIotype basWrkIotype) {
if (Cools.isEmpty(basWrkIotype)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
if (null == basWrkIotype.getIoType()){
basWrkIotypeService.insert(basWrkIotype);
@@ -71,7 +72,7 @@
}
@RequestMapping(value = "/basWrkIotype/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬫坊鍔�")
public R add(BasWrkIotype basWrkIotype) {
basWrkIotype.setModiUser(getUserId());
basWrkIotype.setModiTime(new Date());
@@ -82,10 +83,10 @@
}
@RequestMapping(value = "/basWrkIotype/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬩慨鏀�")
public R update(BasWrkIotype basWrkIotype){
if (Cools.isEmpty(basWrkIotype) || null==basWrkIotype.getIoType()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
basWrkIotype.setModiUser(getUserId());
basWrkIotype.setModiTime(new Date());
@@ -94,11 +95,11 @@
}
@RequestMapping(value = "/basWrkIotype/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪垹闄�")
public R delete(@RequestParam String param){
List<BasWrkIotype> list = JSONArray.parseArray(param, BasWrkIotype.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (BasWrkIotype entity : list){
basWrkIotypeService.delete(new EntityWrapper<>(entity));
@@ -107,7 +108,7 @@
}
@RequestMapping(value = "/basWrkIotype/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
@@ -122,7 +123,7 @@
public R query(String condition) {
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
wrapper.like("io_desc", condition);
- Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 30), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasWrkIotype basWrkIotype : page.getRecords()){
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.9.1