From 941bf6ff9bb24315dce4b9e39fb370b9fa766842 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 18 二月 2025 12:35:35 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 6965127..77a144b 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -33,6 +33,25 @@
return R.ok(wrkDetlLogService.selectById(String.valueOf(id)));
}
+ /**
+ * 鏍规嵁宸ヤ綔涓绘。鏌ョ湅鏄庣粏鏃讹紝宸ヤ綔鍙疯繃婊ゆ槑缁�
+ */
+ @RequestMapping(value = "/wrkDetlLogByMast/list/auth")
+ @ManagerAuth
+ public R list1(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Integer wrk_no,
+ @RequestParam String ioTime){
+ EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ if(!Cools.isEmpty(wrk_no) && wrk_no != 0){
+ wrapper.eq("wrk_no",wrk_no);
+ }
+ if(!Cools.isEmpty(ioTime)){
+ wrapper.eq("io_time", DateUtils.convert(ioTime, DateUtils.yyyyMMddHHmmsssss_F));
+ }
+ return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
@RequestMapping(value = "/wrkDetlLog/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@@ -45,7 +64,7 @@
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
else {
- wrapper.orderBy("appe_time", false);
+ wrapper.orderBy("modi_time", false);
}
return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -74,7 +93,7 @@
@ManagerAuth
public R update(WrkDetlLog wrkDetlLog){
if (Cools.isEmpty(wrkDetlLog) || null==wrkDetlLog.getWrkNo()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
wrkDetlLogService.updateById(wrkDetlLog);
return R.ok();
@@ -85,7 +104,7 @@
public R delete(@RequestParam String param){
List<WrkDetlLog> list = JSONArray.parseArray(param, WrkDetlLog.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (WrkDetlLog entity : list){
wrkDetlLogService.delete(new EntityWrapper<>(entity));
--
Gitblit v1.9.1