Browse Source

新版专家录入审核的创建人查询

XMTT 7 years ago
parent
commit
abfe4bd6b7

+ 1 - 1
src/main/java/com/ekexiu/console/system/dao/UserInfoDao.java

@ -44,7 +44,7 @@ public interface UserInfoDao {
44 44
    @PageQuery
45 45
    @OrderBy(" ORDER BY create_time DESC")
46 46
    @Where("state<>'1'")
47
    PageQueryResult<UserInfo> queryAll(Connection con, @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;
47
    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;
48 48
49 49
    @Or
50 50
    @Nullable

+ 2 - 2
src/main/java/com/ekexiu/console/system/service/UserInfoService.java

@ -170,8 +170,8 @@ public class UserInfoService {
170 170
171 171
    @Path("/pqAll")
172 172
    @Get
173
    PageQueryResult<UserInfo> pageQueryAll(@JdbcConn Connection con, @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 {
174
        return this.userInfoDao.queryAll(con, name == null ? null : "%" + name + "%", orgName == null ? null : "%" + orgName + "%", state, bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
173
    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 {
174
        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);
175 175
    }
176 176
177 177
    @Path("/entryCheck")