diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/shift/domain/ShiftQuery.java b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/shift/domain/ShiftQuery.java
index f834bab..94eb366 100644
--- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/shift/domain/ShiftQuery.java
+++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/shift/domain/ShiftQuery.java
@@ -2,6 +2,10 @@ package com.ruoyi.yh.shift.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @author wjh
@@ -13,4 +17,8 @@ public class ShiftQuery extends ShiftVO{
     @ApiModelProperty("用户名称")
     private String userName;
 
+    @ApiModelProperty("调班时间范围")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private List<LocalDateTime> shiftTimeRange;
+
 }
diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/shift/mapper/ShiftMapper.xml b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/shift/mapper/ShiftMapper.xml
index 43a7ce5..58853e9 100644
--- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/shift/mapper/ShiftMapper.xml
+++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/shift/mapper/ShiftMapper.xml
@@ -53,6 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.userName != null  and query.userName != ''">
             and su.nick_name like concat('%', #{query.userName}, '%')
         </if>
+        <if test="query.shiftTimeRange != null and query.shiftTimeRange.size() > 1">
+            and bs.shift_time_end >= #{query.shiftTimeRange[0]}
+            and bs.shift_time_start &lt;= #{query.shiftTimeRange[1]}
+        </if>
         ${query.params.dataScope}
     </sql>