chuangte/yh-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

临时调班

Browse Source
This commit is contained in:
磷叶 2024-12-07 17:53:36 +08:00
parent 3702e8d175
commit 69d06e22b3
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/shift/domain/ShiftQuery.java
View File

@ -2,6 +2,10 @@ package com.ruoyi.yh.shift.domain;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
/** /**
* @author wjh * @author wjh
@ -13,4 +17,8 @@ public class ShiftQuery extends ShiftVO{
@ApiModelProperty("用户名称") @ApiModelProperty("用户名称")
private String userName; private String userName;
@ApiModelProperty("调班时间范围")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private List<LocalDateTime> shiftTimeRange;
} }

4
common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/shift/mapper/ShiftMapper.xml
View File

@ -53,6 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.userName != null and query.userName != ''"> <if test="query.userName != null and query.userName != ''">
and su.nick_name like concat('%', #{query.userName}, '%') and su.nick_name like concat('%', #{query.userName}, '%')
</if> </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} ${query.params.dataScope}
</sql> </sql>