111

src/main/java/com/ekexiu/portal/platform/ButtedProfessorInfo.java

@@ -6,7 +6,7 @@ import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import com.ekexiu.portal.po.Professor;
@ExtendView(fromSentence="PROFESSOR P INNER JOIN BUTTED_ORG B ON P.ID = B.OID" ,tableAlias="P")
@ExtendView(fromSentence="PROFESSOR P INNER JOIN BUTTED_PROFESSOR B ON P.ID = B.UID" ,tableAlias="P")
public class ButtedProfessorInfo extends Professor {
	private String buttedTime;
	private Integer hasHeadImage;

src/main/java/com/ekexiu/portal/platform/Console.java

@@ -106,4 +106,15 @@ public class Console {
    public PageQueryResult<PlatformInfo> query(@JdbcConn Connection con, @Nullable String name, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize) throws SQLException {
        return this.platformDao.query(con, name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
    }
    @Get
    @Path("/pqButtedProfessors")
    public PageQueryResult<ButtedProfessorInfo> pageQueryButtedProfessorinfos(@JdbcConn Connection con,@Nullable String pid,@Nullable String name, int pageSize, int pageNo)
            throws SQLException {
        PageQueryResult<ButtedProfessorInfo> ret = new PageQueryResult<ButtedProfessorInfo>();
        if (pid != null) {
            ret = this.platformDao.queryButtedProfessorInfo(con, pid,name, pageSize, pageNo);
        }
        return ret;
    }
}

src/main/java/com/ekexiu/portal/platform/PlatformDao.java

@@ -209,4 +209,10 @@ public interface PlatformDao {
	@PageQuery
	@OrderBy(" ORDER BY create_time DESC NULLS LAST")
	PageQueryResult<PlatformInfo> query(Connection con, @Nullable @Like String name, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
	@PageQuery
	@OrderBy(value = "ORDER BY BUTTE_TIME DESC,ID ASC")
	@Exclude({"descp"})
	PageQueryResult<ButtedProfessorInfo> queryButtedProfessorInfo(Connection con,
																  @SqlColumn(handlerClass = StringHandler.class, value = { "B.PID=?" }) String pid,@Nullable @SqlColumn(handlerClass = StringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
}

src/main/resources/database.sql

@@ -2362,6 +2362,15 @@ update DEMAND set ORG_NAME =(SELECT NAME FROM ORGANIZATION WHERE ID =  DEMAND.OR
ALTER TABLE DEMAND DROP COLUMN ORG_ID;
ALTER TABLE DEMAND ALTER COLUMN ORG_NAME SET  NOT NULL;
ALTER TABLE public.article ADD owner_id CHAR(32) NULL;
UPDATE public.article set owner_id = professor_id WHERE article_type = '1'
UPDATE public.article SET owner_id = org_id WHERE article_type = '2'
ALTER TABLE public.article DROP professor_id;
ALTER TABLE public.article DROP org_id