diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java index 215d7590..cc27e6d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java @@ -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 list(UserAdminVo query, PageQuery pageQuery) { + public TableDataInfo 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 result = userService.pageAdmin(pageQuery, query); return TableDataInfo.build(result); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java index 99089d89..f805ccac 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java @@ -30,4 +30,7 @@ public class UserAdminVo extends User { private String inviteUsercode; private String inviteNickname; private String inviteAvatar; + + private LocalDateTime regBeginTime; + private LocalDateTime regEndTime; } diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml index 9130a112..e4085360 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml @@ -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 + + and t2.reg_time >= #{query.regBeginTime} + + + + and t4.status = #{query.onlineStatus}