From 72c06d5800d3a99dbd7002a6946be749d9264b15 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 26 六月 2025 10:44:26 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index caaec40..ed8b736 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basWrkStatus/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 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 Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basWrkStatusService.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]));
@@ -60,10 +62,10 @@
@RequestMapping(value = "/basWrkStatus/edit/auth")
@ManagerAuth
public R edit(BasWrkStatus basWrkStatus) {
- if (Cools.isEmpty(basWrkStatus)){
+ if (Cools.isEmpty(basWrkStatus)) {
return R.error();
}
- if (null == basWrkStatus.getWrkSts()){
+ if (null == basWrkStatus.getWrkSts()) {
basWrkStatusService.insert(basWrkStatus);
} else {
basWrkStatusService.updateById(basWrkStatus);
@@ -82,10 +84,10 @@
return R.ok();
}
- @RequestMapping(value = "/basWrkStatus/update/auth")
+ @RequestMapping(value = "/basWrkStatus/update/auth")
@ManagerAuth(memo = "宸ヤ綔鐘舵�佷慨鏀�")
- public R update(BasWrkStatus basWrkStatus){
- if (Cools.isEmpty(basWrkStatus) || null==basWrkStatus.getWrkSts()){
+ public R update(BasWrkStatus basWrkStatus) {
+ if (Cools.isEmpty(basWrkStatus) || null == basWrkStatus.getWrkSts()) {
return R.error();
}
basWrkStatus.setModiUser(getUserId());
@@ -96,12 +98,12 @@
@RequestMapping(value = "/basWrkStatus/delete/auth")
@ManagerAuth(memo = "宸ヤ綔鐘舵�佸垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasWrkStatus entity : list){
+ for (BasWrkStatus entity : list) {
basWrkStatusService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -109,7 +111,7 @@
@RequestMapping(value = "/basWrkStatus/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<BasWrkStatus> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWrkStatus"));
@@ -125,7 +127,7 @@
wrapper.like("wrk_desc", condition);
Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 20), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasWrkStatus basWrkStatus : page.getRecords()){
+ for (BasWrkStatus basWrkStatus : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basWrkStatus.getWrkSts());
map.put("value", basWrkStatus.getWrkDesc());
@@ -138,7 +140,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasWrkStatus> wrapper = new EntityWrapper<BasWrkStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWrkStatusService.selectOne(wrapper)){
+ if (null != basWrkStatusService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasWrkStatus.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1