XMTT 7 years ago
parent
commit
374299c365

+ 2 - 2
src/main/java/com/ekexiu/console/system/dao/ProfessorDao.java

@ -82,11 +82,11 @@ public interface ProfessorDao {
82 82
83 83
    @PageQuery
84 84
    @OrderBy("ORDER BY create_time DESC NULLS LAST")
85
    PageQueryResult<UserDetail> pageQueryUserDetail(Connection con, @Nullable @Like String name,@Nullable String activeStatus,@Nullable Integer sendMailStatus,@Nullable @Alias("createTime") @GtEq String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
85
    PageQueryResult<UserDetail> pageQueryUserDetail(Connection con, @Nullable @Like String name,@Nullable String activeStatus,@Nullable Integer sendMailStatus,@Nullable @Like String loginPhone,@Nullable @Like String loginEmail,@Nullable @Alias("createTime") @GtEq String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
86 86
87 87
    @PageQuery
88 88
    @OrderBy("ORDER BY page_views DESC NULLS Last")
89
    PageQueryResult<UserDetail> pageQueryUserDetailBV(Connection con, @Nullable @Like String name,@Nullable String activeStatus,@Nullable Integer sendMailStatus,@Nullable @Alias("createTime") @GtEq String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
89
    PageQueryResult<UserDetail> pageQueryUserDetailBV(Connection con, @Nullable @Like String name,@Nullable String activeStatus,@Nullable Integer sendMailStatus,@Nullable @Like String loginPhone,@Nullable @Like String loginEmail,@Nullable @Alias("createTime") @GtEq String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
90 90
91 91
    @UpdateWith
92 92
    @From(Professor.class)

+ 3 - 3
src/main/java/com/ekexiu/console/system/service/ProfessorService.java

@ -263,11 +263,11 @@ public class ProfessorService {
263 263
264 264
    @Get
265 265
    @Path("/pqUserDetail")
266
    public PageQueryResult<UserDetail> userDetailPageQueryResult(@JdbcConn Connection con, @Nullable String name, @Nullable String activeStatus, @Nullable Integer sendMailStatus,int orderBy, @Nullable String bt, @Nullable String et, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
266
    public PageQueryResult<UserDetail> userDetailPageQueryResult(@JdbcConn Connection con, @Nullable String name, @Nullable String activeStatus, @Nullable Integer sendMailStatus,@Nullable String loginPhone,@Nullable String loginEmail, int orderBy, @Nullable String bt, @Nullable String et, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
267 267
        if(orderBy==1) {
268
            return this.professorDao.pageQueryUserDetail(con, name == null ? null : "%" + name + "%", activeStatus, sendMailStatus, bt, et, pageSize, pageNo);
268
            return this.professorDao.pageQueryUserDetail(con, name == null ? null : "%" + name + "%", activeStatus, sendMailStatus,loginPhone == null ? null : "%" + loginPhone + "%",loginEmail == null ? null : "%" + loginEmail + "%", bt, et, pageSize, pageNo);
269 269
        }else{
270
            return this.professorDao.pageQueryUserDetailBV(con, name == null ? null : "%" + name + "%", activeStatus, sendMailStatus, bt, et, pageSize, pageNo);
270
            return this.professorDao.pageQueryUserDetailBV(con, name == null ? null : "%" + name + "%", activeStatus, sendMailStatus,loginPhone == null ? null : "%" + loginPhone + "%",loginEmail == null ? null : "%" + loginEmail + "%", bt, et, pageSize, pageNo);
271 271
        }
272 272
    }
273 273