From a5ff9433c3e8a552205a15e83fcbe7ce4281b789 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 04 一月 2025 12:34:25 +0800
Subject: [PATCH] 日志查询功能完善

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/OperateLogController.java |   11 +++++++++++
 zy-asrs-wms/src/main/webapp/views/operateLog/operateLog.html                             |   14 +++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/OperateLogController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/OperateLogController.java
index 6c1e6b0..eacc202 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/OperateLogController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/OperateLogController.java
@@ -36,9 +36,20 @@
                   @RequestParam(required = false)String orderByType,
                   @RequestParam Map<String, Object> param){
         LambdaQueryWrapper<OperateLog> wrapper = new LambdaQueryWrapper<>();
+        if (!Cools.isEmpty(param.get("action"))) {
+            wrapper.like(OperateLog::getAction, param.get("action"));
+        }
+        if (!Cools.isEmpty(param.get("request"))) {
+            wrapper.like(OperateLog::getRequest, param.get("request"));
+        }
+        if (!Cools.isEmpty(param.get("response"))) {
+            wrapper.like(OperateLog::getResponse, param.get("response"));
+        }
+        wrapper.orderByDesc(OperateLog::getCreateTime);
         return R.ok(operateLogService.page(new Page<>(curr, limit), wrapper));
     }
 
+
     @RequestMapping(value = "/operateLog/edit/auth")
     @ManagerAuth
     public R edit(OperateLog operateLog) {
diff --git a/zy-asrs-wms/src/main/webapp/views/operateLog/operateLog.html b/zy-asrs-wms/src/main/webapp/views/operateLog/operateLog.html
index d4bb579..39259c4 100644
--- a/zy-asrs-wms/src/main/webapp/views/operateLog/operateLog.html
+++ b/zy-asrs-wms/src/main/webapp/views/operateLog/operateLog.html
@@ -19,17 +19,17 @@
                 <div class="layui-form-item">
                     <div class="layui-inline">
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
-                        </div>
-                    </div>
-                     <div class="layui-inline" style="width: 300px">
-                        <div class="layui-input-inline">
-                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                            <input class="layui-input" type="text" name="action" placeholder="璁块棶鍦板潃" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+                            <input class="layui-input" type="text" name="request" placeholder="璇锋眰鏁版嵁" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="response" placeholder="鍝嶅簲鏁版嵁" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">&emsp;

--
Gitblit v1.9.1