From 39830df8eb703b8037bcc557fcb22a933f84d1d9 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 3 Aug 2024 11:11:47 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youlai/system/model/query/UserPageQuery.java | 11 ++++-------
 .../system/service/impl/SysUserServiceImpl.java  |  5 -----
 src/main/resources/mapper/SysUserMapper.xml      | 16 +++++++++-------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/youlai/system/model/query/UserPageQuery.java b/src/main/java/com/youlai/system/model/query/UserPageQuery.java
index 17d75cff..f275ef7f 100644
--- a/src/main/java/com/youlai/system/model/query/UserPageQuery.java
+++ b/src/main/java/com/youlai/system/model/query/UserPageQuery.java
@@ -3,7 +3,8 @@ package com.youlai.system.model.query;
 import com.youlai.system.common.base.BasePageQuery;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.List;
 
 /**
  * 用户分页查询对象
@@ -24,11 +25,7 @@ public class UserPageQuery extends BasePageQuery {
     @Schema(description="部门ID")
     private Long deptId;
 
-    @Schema(description="创建时间-开始时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private String startTime;
+    @Schema(description="创建时间范围")
+    private List<String> createTimeRange;
 
-    @Schema(description="创建时间-结束时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private String endTime;
 }
diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
index 0abb659e..f7451e88 100644
--- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.system.common.constant.SystemConstants;
-import com.youlai.system.util.DateUtils;
 import com.youlai.system.converter.UserConverter;
 import com.youlai.system.security.util.SecurityUtils;
 import com.youlai.system.mapper.SysUserMapper;
@@ -68,10 +67,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         int pageNum = queryParams.getPageNum();
         int pageSize = queryParams.getPageSize();
         Page<UserBO> page = new Page<>(pageNum, pageSize);
-
-        // 格式化为数据库日期格式，避免日期比较使用格式化函数导致索引失效
-        DateUtils.toDatabaseFormat(queryParams, "startTime", "endTime");
-
         // 查询数据
         Page<UserBO> userPage = this.baseMapper.listPagedUsers(page, queryParams);
 
diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml
index 84617342..b102b406 100644
--- a/src/main/resources/mapper/SysUserMapper.xml
+++ b/src/main/resources/mapper/SysUserMapper.xml
@@ -37,15 +37,17 @@
             <if test='queryParams.deptId!=null'>
                 AND concat(',',concat(d.tree_path,',',d.id),',') like concat('%,',#{queryParams.deptId},',%')
             </if>
-            <if test="queryParams.startTime != null">
-                AND u.create_time &gt;= #{queryParams.startTime}
+            <if test='queryParams.createTimeRange != null'>
+                <if test="queryParams.createTimeRange[0] != null and queryParams.createTimeRange[0].trim() neq ''">
+                    AND u.create_time >=CONCAT(#{queryParams.createTimeRange[0]}, ' 00:00:00')
+                </if>
+                <if test="queryParams.createTimeRange[1] != null and queryParams.createTimeRange[0].trim() neq ''">
+                    AND u.create_time &lt;= CONCAT(#{queryParams.createTimeRange[1]}, ' 23:59:59')
+                </if>
             </if>
-            <if test="queryParams.endTime != null">
-                AND u.create_time &lt;= #{queryParams.endTime}
-            </if>
-
         </where>
-        GROUP BY u.id
+        GROUP BY
+            u.id
     </select>
 
     <!-- 用户表单信息映射 -->