From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index c7b24b5..2dbefa2 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -51,7 +51,7 @@
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}else {
- wrapper.orderBy("io_time", false);
+ wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -64,20 +64,24 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ if (entry.getKey().equals("manu_type")) {
+ wrapper.like(entry.getKey(), val);
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
}
}
}
@RequestMapping(value = "/wrkMastLog/add/auth")
- @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｆ坊鍔�")
+ @ManagerAuth(memo = "response.work_history_add")
public R add(WrkMastLog wrkMastLog) {
wrkMastLogService.insert(wrkMastLog);
return R.ok();
}
@RequestMapping(value = "/wrkMastLog/update/auth")
- @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
+ @ManagerAuth(memo = "response.work_history_update")
public R update(WrkMastLog wrkMastLog){
if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
return R.error();
@@ -87,7 +91,7 @@
}
@RequestMapping(value = "/wrkMastLog/delete/auth")
- @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ垹闄�")
+ @ManagerAuth(memo = "response.work_history_delete")
public R delete(@RequestParam String param){
List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
if (Cools.isEmpty(list)){
@@ -100,7 +104,7 @@
}
@RequestMapping(value = "/wrkMastLog/export/auth")
- @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ鍑�")
+ @ManagerAuth(memo = "response.work_history_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
@@ -131,7 +135,9 @@
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)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
+ return r;
}
return R.ok();
}
--
Gitblit v1.9.1