From 24bc9aa5888c7b98cf0a7d1bf05ec6c5624d3719 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 03 三月 2025 16:02:29 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
index 71e7913..f9b185b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
@@ -58,6 +58,30 @@
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/wrkMastLogWithWrktype/list/auth")
+ @ManagerAuth
+ public R wrkMastLogWithWrktypeList(@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<AgvWrkMastLog> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ allLike(AgvWrkMastLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){
+ if (orderByField.endsWith("$")){
+ orderByField = orderByField.substring(0, orderByField.length()-1);
+ }
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }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()){
String val = String.valueOf(entry.getValue());
@@ -86,7 +110,7 @@
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
public R update(AgvWrkMastLog wrkMastLog){
if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
wrkMastLogService.updateById(wrkMastLog);
return R.ok();
@@ -97,7 +121,7 @@
public R delete(@RequestParam String param){
List<AgvWrkMastLog> list = JSONArray.parseArray(param, AgvWrkMastLog.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (AgvWrkMastLog entity : list){
wrkMastLogService.delete(new EntityWrapper<>(entity));
--
Gitblit v1.9.1