From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 16 十月 2025 09:55:35 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/asrs/controller/AdjDetlController.java | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AdjDetlController.java b/src/main/java/com/zy/asrs/controller/AdjDetlController.java index 8db1a01..6a90f89 100644 --- a/src/main/java/com/zy/asrs/controller/AdjDetlController.java +++ b/src/main/java/com/zy/asrs/controller/AdjDetlController.java @@ -35,28 +35,28 @@ @RequestMapping(value = "/adjDetl/list/auth") @ManagerAuth - public R list(@RequestParam(defaultValue = "1")Integer curr, - @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){ + public R list(@RequestParam(defaultValue = "1") Integer curr, + @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<AdjDetl> wrapper = new EntityWrapper<>(); convert(param, wrapper); allLike(AdjDetl.class, param.keySet(), wrapper, condition); - if (!Cools.isEmpty(orderByField)){ + if (!Cools.isEmpty(orderByField)) { wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); - }else { + } else { wrapper.orderBy("modi_time", false); } return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper)); } - private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ - for (Map.Entry<String, Object> entry : map.entrySet()){ + private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) { + for (Map.Entry<String, Object> entry : map.entrySet()) { String val = String.valueOf(entry.getValue()); - if (val.contains(RANGE_TIME_LINK)){ + 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])); @@ -73,10 +73,10 @@ return R.ok(); } - @RequestMapping(value = "/adjDetl/update/auth") - @ManagerAuth - public R update(AdjDetl adjDetl){ - if (Cools.isEmpty(adjDetl) || null==adjDetl.getAdjId()){ + @RequestMapping(value = "/adjDetl/update/auth") + @ManagerAuth + public R update(AdjDetl adjDetl) { + if (Cools.isEmpty(adjDetl) || null == adjDetl.getAdjId()) { return R.error(); } adjDetlService.updateById(adjDetl); @@ -85,12 +85,12 @@ @RequestMapping(value = "/adjDetl/delete/auth") @ManagerAuth - public R delete(@RequestParam String param){ + public R delete(@RequestParam String param) { List<AdjDetl> list = JSONArray.parseArray(param, AdjDetl.class); - if (Cools.isEmpty(list)){ + if (Cools.isEmpty(list)) { return R.error(); } - for (AdjDetl entity : list){ + for (AdjDetl entity : list) { adjDetlService.delete(new EntityWrapper<>(entity)); } return R.ok(); @@ -98,7 +98,7 @@ @RequestMapping(value = "/adjDetl/export/auth") @ManagerAuth - public R export(@RequestBody JSONObject param){ + public R export(@RequestBody JSONObject param) { List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>(); Map<String, Object> map = excludeTrash(param.getJSONObject("adjDetl")); @@ -114,7 +114,7 @@ wrapper.like("adj_id", condition); Page<AdjDetl> page = adjDetlService.selectPage(new Page<>(0, 10), wrapper); List<Map<String, Object>> result = new ArrayList<>(); - for (AdjDetl adjDetl : page.getRecords()){ + for (AdjDetl adjDetl : page.getRecords()) { Map<String, Object> map = new HashMap<>(); map.put("id", adjDetl.getAdjId()); map.put("value", adjDetl.getAdjId()); @@ -127,7 +127,7 @@ @ManagerAuth public R query(@RequestBody JSONObject param) { Wrapper<AdjDetl> wrapper = new EntityWrapper<AdjDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); - if (null != adjDetlService.selectOne(wrapper)){ + if (null != adjDetlService.selectOne(wrapper)) { return R.parse(BaseRes.REPEAT).add(getComment(AdjDetl.class, String.valueOf(param.get("key")))); } return R.ok(); -- Gitblit v1.9.1