xieyinlu/zhilu-admin
1
0
Fork 0
mirror of https://github.com/ccmjga/zhilu-admin synced 2026-03-13 21:27:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

add date picker

Browse Source
This commit is contained in:
Chuck1sn
2025-06-13 14:36:47 +08:00
parent a00c3e129f
commit ac6c50ff28
14 changed files with 138 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/com/zl/mjga/dto/urp/UserQueryDto.java
View File

@@ -1,6 +1,6 @@
package com.zl.mjga.dto.urp;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import lombok.*;
@AllArgsConstructor
@@ -8,6 +8,6 @@ import lombok.*;
@Data
public class UserQueryDto {
private String username;
private LocalDateTime starDate;
private LocalDateTime endDate;
private OffsetDateTime startDate;
private OffsetDateTime endDate;
}

13
backend/src/main/java/com/zl/mjga/repository/UserRepository.java
View File

@@ -1,6 +1,5 @@
package com.zl.mjga.repository;
import static org.jooq.generated.mjga.Tables.*;
import static org.jooq.generated.mjga.tables.User.USER;
import static org.jooq.impl.DSL.*;
@@ -65,8 +64,8 @@ public class UserRepository extends UserDao {
? USER.USERNAME.like("%" + userQueryDto.getUsername() + "%")
: noCondition())
.and(
userQueryDto.getStarDate() != null
? USER.CREATE_TIME.ge(userQueryDto.getStarDate())
userQueryDto.getStartDate() != null
? USER.CREATE_TIME.ge(userQueryDto.getStartDate())
: noCondition())
.and(
userQueryDto.getEndDate() != null
@@ -79,13 +78,7 @@ public class UserRepository extends UserDao {
}
public Result<Record> pageFetchBy(PageRequestDto pageRequestDto, UserQueryDto userQueryDto) {
return ctx()
.select(asterisk(), DSL.count().over().as("total_user"))
.from(USER)
.where(
userQueryDto.getUsername() != null
? USER.USERNAME.like("%" + userQueryDto.getUsername() + "%")
: noCondition())
return selectBy(userQueryDto)
.orderBy(pageRequestDto.getSortFields())
.limit(pageRequestDto.getSize())
.offset(pageRequestDto.getOffset())

2
backend/src/main/resources/db/migration/V1_0_0__init_table.sql
View File

@@ -3,7 +3,7 @@ CREATE SCHEMA IF NOT EXISTS mjga;
CREATE TABLE mjga.user (
id BIGSERIAL PRIMARY KEY,
username VARCHAR NOT NULL UNIQUE,
create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
create_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
password VARCHAR NOT NULL,
enable BOOLEAN NOT NULL DEFAULT TRUE
);