shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1231123

Browse Source
This commit is contained in:
77
2024-05-29 10:34:43 +08:00
parent c33fb2e699
commit 3b7afaf571
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java
View File

@@ -30,6 +30,10 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
@@ -53,7 +57,15 @@ public class UserController extends BaseController {
*/
@SaCheckPermission("cai:user:list")
@GetMapping("/list")
public TableDataInfo<UserAdminVo> list(UserAdminVo query, PageQuery pageQuery) {
public TableDataInfo<UserAdminVo> list(UserAdminVo query, PageQuery pageQuery,String regBeginDateStr,String regEndDateStr) {
if(regBeginDateStr != null){
LocalDateTime time = LocalDate.parse(regBeginDateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd")).atTime(LocalTime.MIN);
query.setRegBeginTime(time);
}
if(regEndDateStr != null){
LocalDateTime time = LocalDate.parse(regEndDateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd")).atTime(LocalTime.MIN);
query.setRegEndTime(time);
}
Page<UserAdminVo> result = userService.pageAdmin(pageQuery, query);
return TableDataInfo.build(result);
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java
View File

@@ -30,4 +30,7 @@ public class UserAdminVo extends User {
private String inviteUsercode;
private String inviteNickname;
private String inviteAvatar;
private LocalDateTime regBeginTime;
private LocalDateTime regEndTime;
}

8
ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
View File

@@ -13,6 +13,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join cai_user t3 on t1.invite_id = t3.id
left join cai_user_online t4 on t1.id = t4.user_id
<where>
<if test="query.regBeginTime != null">
and t2.reg_time >= #{query.regBeginTime}
</if>
<if test="query.regEndTime != null">
<![CDATA[
and t2.reg_time <= #{query.regEndTime}
]]>
</if>
<if test="query.onlineStatus != null">
and t4.status = #{query.onlineStatus}
</if>