From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WrkLastnoController.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 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..b7a06ba 100644
--- a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
@@ -44,56 +44,57 @@
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 = "response.wrk_lastno_add")
public R add(WrkLastno wrkLastno) {
wrkLastno.setModiUser(getUserId());
wrkLastno.setModiTime(new Date());
wrkLastno.setAppeUser(getUserId());
wrkLastno.setAppeTime(new Date());
wrkLastnoService.insert(wrkLastno);
- return R.ok();
+ return R.ok("response.save_success");
}
- @RequestMapping(value = "/wrkLastno/update/auth")
- @ManagerAuth
+ @RequestMapping(value = "/wrkLastno/update/auth")
+ @ManagerAuth(memo = "response.wrk_lastno_update")
public R update(WrkLastno wrkLastno){
if (Cools.isEmpty(wrkLastno) || null==wrkLastno.getWrkMk()){
- return R.error();
+ return R.error("response.param_error");
}
wrkLastno.setModiUser(getUserId());
wrkLastno.setModiTime(new Date());
wrkLastnoService.updateById(wrkLastno);
- return R.ok();
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/wrkLastno/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.wrk_lastno_delete")
public R delete(@RequestParam String param){
List<WrkLastno> list = JSONArray.parseArray(param, WrkLastno.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.param_error");
}
for (WrkLastno entity : list){
wrkLastnoService.delete(new EntityWrapper<>(entity));
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/wrkLastno/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.wrk_lastno_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
@@ -124,7 +125,9 @@
public R query(@RequestBody JSONObject param) {
Wrapper<WrkLastno> wrapper = new EntityWrapper<WrkLastno>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != wrkLastnoService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkLastno.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(WrkLastno.class, String.valueOf(param.get("key"))));
+ return r;
}
return R.ok();
}
--
Gitblit v1.9.1