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/BasWrkStatusController.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index ffb739e..1106c21 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -61,54 +61,54 @@
@ManagerAuth
public R edit(BasWrkStatus basWrkStatus) {
if (Cools.isEmpty(basWrkStatus)){
- return R.error();
+ return R.error("response.param_error");
}
if (null == basWrkStatus.getWrkSts()){
basWrkStatusService.insert(basWrkStatus);
} else {
basWrkStatusService.updateById(basWrkStatus);
}
- return R.ok();
+ return R.ok("response.save_success");
}
@RequestMapping(value = "/basWrkStatus/add/auth")
- @ManagerAuth(memo = "宸ヤ綔鐘舵�佹坊鍔�")
+ @ManagerAuth(memo = "response.work_status_add")
public R add(BasWrkStatus basWrkStatus) {
basWrkStatus.setModiUser(getUserId());
basWrkStatus.setModiTime(new Date());
basWrkStatus.setAppeUser(getUserId());
basWrkStatus.setAppeTime(new Date());
basWrkStatusService.insert(basWrkStatus);
- return R.ok();
+ return R.ok("response.save_success");
}
- @RequestMapping(value = "/basWrkStatus/update/auth")
- @ManagerAuth(memo = "宸ヤ綔鐘舵�佷慨鏀�")
+ @RequestMapping(value = "/basWrkStatus/update/auth")
+ @ManagerAuth(memo = "response.work_status_update")
public R update(BasWrkStatus basWrkStatus){
if (Cools.isEmpty(basWrkStatus) || null==basWrkStatus.getWrkSts()){
- return R.error();
+ return R.error("response.param_error");
}
basWrkStatus.setModiUser(getUserId());
basWrkStatus.setModiTime(new Date());
basWrkStatusService.updateById(basWrkStatus);
- return R.ok();
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/basWrkStatus/delete/auth")
- @ManagerAuth(memo = "宸ヤ綔鐘舵�佸垹闄�")
+ @ManagerAuth(memo = "response.work_status_delete")
public R delete(@RequestParam String param){
List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.param_error");
}
for (BasWrkStatus entity : list){
basWrkStatusService.delete(new EntityWrapper<>(entity));
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/basWrkStatus/export/auth")
- @ManagerAuth(memo = "宸ヤ綔鐘舵�佸鍑�")
+ @ManagerAuth(memo = "response.work_status_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
@@ -123,7 +123,7 @@
public R query(String condition) {
EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
wrapper.like("wrk_desc", condition);
- Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 20), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasWrkStatus basWrkStatus : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -139,9 +139,11 @@
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)){
- return R.parse(BaseRes.REPEAT).add(getComment(BasWrkStatus.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(BasWrkStatus.class, String.valueOf(param.get("key"))));
+ return r;
}
- return R.ok();
+ return R.ok("response.operation_success");
}
}
--
Gitblit v1.9.1