From d4764bcbb80efc278b7dd35e62112eb4b1335ce9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 24 三月 2025 10:05:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 7e0bec4..7d83c8d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -35,31 +35,31 @@
@RequestMapping(value = "/wrkMastLog/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<WrkMastLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.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]));
@@ -80,10 +80,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkMastLog/update/auth")
- @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
- public R update(WrkMastLog wrkMastLog){
- if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
+ @RequestMapping(value = "/wrkMastLog/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
+ public R update(WrkMastLog wrkMastLog) {
+ if (Cools.isEmpty(wrkMastLog) || null == wrkMastLog.getId()) {
return R.error();
}
wrkMastLogService.updateById(wrkMastLog);
@@ -92,12 +92,12 @@
@RequestMapping(value = "/wrkMastLog/delete/auth")
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkMastLog entity : list){
+ for (WrkMastLog entity : list) {
wrkMastLogService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -105,7 +105,7 @@
@RequestMapping(value = "/wrkMastLog/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<WrkMastLog> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastLog"));
@@ -121,7 +121,7 @@
wrapper.like("id", condition);
Page<WrkMastLog> page = wrkMastLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastLog wrkMastLog : page.getRecords()){
+ for (WrkMastLog wrkMastLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkMastLog.getId());
map.put("value", wrkMastLog.getId());
@@ -134,7 +134,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkMastLog> wrapper = new EntityWrapper<WrkMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastLogService.selectOne(wrapper)){
+ if (null != wrkMastLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1