1

src/main/java/com/ekexiu/console/system/dao/UserInfoDao.java

@@ -2,6 +2,7 @@ package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.UserInfo;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.Or;
@@ -12,6 +13,7 @@ import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
@@ -44,7 +46,7 @@ public interface UserInfoDao {
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC")
    @Where("state<>'1'")
    PageQueryResult<UserInfo> queryAll(Connection con, @Nullable @Like String creatorName,@Nullable @Like Stringname, @Nullable @Like String orgName, @Nullable String state, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<UserInfo> queryAll(Connection con, @Nullable @Like String creatorName,@Nullable @Like String name, @Nullable @Like String orgName, @Nullable String state, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @Or
    @Nullable

src/main/java/com/ekexiu/console/system/service/UserInfoService.java

@@ -170,7 +170,7 @@ public class UserInfoService {
    @Path("/pqAll")
    @Get
    PageQueryResult<UserInfo> pageQueryAll(@JdbcConn Connection con, @Nullable String creatorName, @Nullable Stringname, @Nullable String orgName, @Nullable String state, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize) throws SQLException {
    PageQueryResult<UserInfo> pageQueryAll(@JdbcConn Connection con, @Nullable String creatorName, @Nullable String name, @Nullable String orgName, @Nullable String state, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize) throws SQLException {
        return this.userInfoDao.queryAll(con, creatorName == null ? null : "%" + creatorName + "%",name == null ? null : "%" + name + "%", orgName == null ? null : "%" + orgName + "%", state, bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
    }