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/WrkDetlController.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
index d4b7c72..fb4231a 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -36,30 +36,30 @@
@RequestMapping(value = "/wrkDetl/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<WrkDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(WrkDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
+ if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
} else {
wrapper.orderBy("appe_time", false);
}
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByBarcode(getUserId(),wrapper);
+ RoleUtils.addRoleWrapperByBarcode(getUserId(), wrapper);
return R.ok(wrkDetlService.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]));
@@ -78,12 +78,12 @@
@RequestMapping(value = "/wrkDetl/delete/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkDetl> list = JSONArray.parseArray(param, WrkDetl.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkDetl entity : list){
+ for (WrkDetl entity : list) {
wrkDetlService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -91,7 +91,7 @@
@RequestMapping(value = "/wrkDetl/export/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkDetl"));
@@ -107,7 +107,7 @@
wrapper.like("id", condition);
Page<WrkDetl> page = wrkDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkDetl wrkDetl : page.getRecords()){
+ for (WrkDetl wrkDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkDetl.getWrkNo());
map.put("value", wrkDetl.getWrkNo());
@@ -120,7 +120,7 @@
@ManagerAuth
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)){
+ if (null != wrkDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkDetl.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1