From e61f054bf5bf18c8a0095b0ee4b5ff0ea0f0d2f1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 20 三月 2025 14:42:30 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 669978a..fc550f8 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("modi_time", false).orderBy("wrk_no", false);
+ wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -64,7 +64,11 @@
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);
+ }
}
}
}
@@ -80,7 +84,7 @@
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
public R update(WrkMastLog wrkMastLog){
if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
- return R.error();
+ return R.error("涓嶅瓨鍦ㄥ伐浣滄。");
}
wrkMastLogService.updateById(wrkMastLog);
return R.ok();
@@ -91,7 +95,7 @@
public R delete(@RequestParam String param){
List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟鏈笂浼�");
}
for (WrkMastLog entity : list){
wrkMastLogService.delete(new EntityWrapper<>(entity));
--
Gitblit v1.9.1