From 71fc5c86cc25319cece67c548a109824196c7027 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Sat, 10 Aug 2024 15:35:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=9D=A1=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B2=A1=E7=94=A8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复用户创建时间条件查询没用的bug
增加系统日志操作时间条件查询
---
 .../com/youlai/system/mapper/SysLogMapper.java     |  2 +-
 .../youlai/system/model/query/LogPageQuery.java    | 11 +++--------
 .../system/service/impl/SysLogServiceImpl.java     |  5 +----
 src/main/resources/mapper/SysLogMapper.xml         | 14 +++++++++-----
 src/main/resources/mapper/SysUserMapper.xml        |  2 +-
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/youlai/system/mapper/SysLogMapper.java b/src/main/java/com/youlai/system/mapper/SysLogMapper.java
index 3976d4bf..d0155dba 100644
--- a/src/main/java/com/youlai/system/mapper/SysLogMapper.java
+++ b/src/main/java/com/youlai/system/mapper/SysLogMapper.java
@@ -28,7 +28,7 @@ public interface SysLogMapper extends BaseMapper<SysLog> {
      * @param queryParams
      * @return
      */
-    Page<LogPageVO> listPagedLogs(Page page, LogPageQuery queryParams);
+    Page<LogPageVO> listPagedLogs(Page<LogPageVO> page, LogPageQuery queryParams);
 
     /**
      * 统计浏览数(PV)
diff --git a/src/main/java/com/youlai/system/model/query/LogPageQuery.java b/src/main/java/com/youlai/system/model/query/LogPageQuery.java
index 2d0d3942..e5bc11e3 100644
--- a/src/main/java/com/youlai/system/model/query/LogPageQuery.java
+++ b/src/main/java/com/youlai/system/model/query/LogPageQuery.java
@@ -4,7 +4,7 @@ import com.youlai.system.common.base.BasePageQuery;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
+import java.util.List;
 
 /**
  * 日志分页查询对象
@@ -20,12 +20,7 @@ public class LogPageQuery extends BasePageQuery {
     @Schema(description="关键字(日志内容/请求路径/请求方法/地区/浏览器/终端系统)")
     private String keywords;
 
-    @Schema(description="开始日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private String startDate;
-
-    @Schema(description="结束日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private String endDate;
+    @Schema(description="操作时间范围")
+    List<String> createTime;
 
 }
diff --git a/src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java
index 65d4baec..dddf28d2 100644
--- a/src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java
@@ -38,10 +38,7 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog>
      */
     @Override
     public Page<LogPageVO> listPagedLogs(LogPageQuery queryParams) {
-        // 格式化为数据库日期格式，避免日期比较使用格式化函数导致索引失效
-        DateUtils.toDatabaseFormat(queryParams, "startDate", "endDate");
-
-        return this.baseMapper.listPagedLogs(new Page(queryParams.getPageNum(), queryParams.getPageSize()),
+        return this.baseMapper.listPagedLogs(new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
                 queryParams);
     }
 
diff --git a/src/main/resources/mapper/SysLogMapper.xml b/src/main/resources/mapper/SysLogMapper.xml
index 51f4fa6e..dc25ae32 100644
--- a/src/main/resources/mapper/SysLogMapper.xml
+++ b/src/main/resources/mapper/SysLogMapper.xml
@@ -32,11 +32,15 @@
                     t2.nickname LIKE concat('%',#{queryParams.keywords},'%')
                 )
             </if>
-            <if test="queryParams.startDate != null">
-                AND t1.create_time &gt;= #{queryParams.startDate}
-            </if>
-            <if test="queryParams.endDate != null">
-                AND t1.create_time &lt;= #{queryParams.endDate}
+            <if test="queryParams.createTime != null and queryParams.createTime.size > 0">
+                <if test="queryParams.createTime[0] != null and queryParams.createTime[0] != ''">
+                    <bind name="startDate" value="queryParams.createTime[0].length() == 10 ? queryParams.createTime[0] + ' 00:00:00' : queryParams.createTime[0]"/>
+                    AND t1.create_time &gt;= #{startDate}
+                </if>
+                <if test="queryParams.createTime[1] != null and queryParams.createTime[1] != ''">
+                    <bind name="endDate" value="queryParams.createTime[1].length() == 10 ? queryParams.createTime[1] + ' 23:59:59' : queryParams.createTime[1]"/>
+                    AND t1.create_time &lt;= #{endDate}
+                </if>
             </if>
         </where>
         ORDER BY
diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml
index de28bdc1..7669c72c 100644
--- a/src/main/resources/mapper/SysUserMapper.xml
+++ b/src/main/resources/mapper/SysUserMapper.xml
@@ -37,7 +37,7 @@
             <if test='queryParams.deptId!=null'>
                 AND concat(',',concat(d.tree_path,',',d.id),',') like concat('%,',#{queryParams.deptId},',%')
             </if>
-            <if test="queryParams.createTime != null ">
+            <if test="queryParams.createTime != null and queryParams.createTime.size > 0">
                 <if test="queryParams.createTime[0] != null and queryParams.createTime[0] != ''">
                     <bind name="startDate" value="queryParams.createTime[0].length() == 10 ? queryParams.createTime[0] + ' 00:00:00' : queryParams.createTime[0]"/>
                     AND u.create_time &gt;= #{startDate}