From cb5092a38a5123bd9da452ad311b9323561802b1 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 20 五月 2025 13:55:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index ff52e9f..9e23b8e 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,
@@ -43,7 +62,13 @@
EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+ if(!Cools.isEmpty(param.get("anfme"))){
+ wrapper.eq("anfme",param.get("anfme"));
+ }
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("modi_time", false);
+ }
return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1