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/WrkDetlController.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
index c645c25..404a743 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,10 +39,12 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ allLike(WrkDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
} else {
@@ -51,40 +53,41 @@
return R.ok(wrkDetlService.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 = "/wrkDetl/add/auth")
- @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗘坊鍔�")
+ @ManagerAuth(memo = "response.wrk_detl_add")
public R add(WrkDetl wrkDetl) {
wrkDetlService.insert(wrkDetl);
- return R.ok();
+ return R.ok("response.save_success");
}
@RequestMapping(value = "/wrkDetl/delete/auth")
- @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗垹闄�")
+ @ManagerAuth(memo = "response.wrk_detl_delete")
public R delete(@RequestParam String param){
List<WrkDetl> list = JSONArray.parseArray(param, WrkDetl.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.param_error");
}
for (WrkDetl entity : list){
wrkDetlService.delete(new EntityWrapper<>(entity));
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/wrkDetl/export/auth")
- @ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗鍑�")
+ @ManagerAuth(memo = "response.wrk_detl_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
@@ -115,7 +118,9 @@
public R query(@RequestBody JSONObject param) {
Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != wrkDetlService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkDetl.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(WrkDetl.class, String.valueOf(param.get("key"))));
+ return r;
}
return R.ok();
}
--
Gitblit v1.9.1