111

src/main/java/com/ekexiu/portal/dao/ArticleDao.java

@@ -183,17 +183,16 @@ public abstract class ArticleDao {
	@PageSelect
	@OrderBy(" ORDER BY PUBLISH_TIME DESC,SHARE_ID ASC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryPublish(Connection con, String ownerId,String articleType, @Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "OWNER_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
	public abstract PageQueryResult<Article> pageQueryPublish(Connection con, String ownerId,String articleType, @Nullable @In String[] status,@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "OWNER_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
			"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)", "ARTICLE_TITLE LIKE ?",
			"SUBJECT LIKE ?" }, additional = 1, isAnd = false) String key,int pageSize, int pageNo) throws SQLException;
	@LimitQuery
	@OrderBy(cols = { @LimitColumn(value = "publishTime", column = "PUBLISH_TIME", handlerClass = StringHandler.class, asc = false),
			@LimitColumn(value = "articleId", column = "ARTICLE_ID", asc = false, handlerClass = StringHandler.class) }, value = "")
	@Where("STATUS = '1'")
	@Exclude({ "descp" })
	public abstract List<Article> queryPublish(Connection con,String ownerId, String publishTime, String articleId,
											  @SqlColumn(handlerClass = StringHandler.class, value = { "STATUS=?" }) String articleType,@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "OWNER_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
											  @SqlColumn(handlerClass = StringHandler.class, value = { "STATUS=?" }) String articleType,@Nullable @In String[] status,@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "OWNER_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
			"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)", "ARTICLE_TITLE LIKE ?",
			"SUBJECT LIKE ?" }, additional = 1, isAnd = false) String key,
											  int rows) throws SQLException;

src/main/java/com/ekexiu/portal/dao/DemandDao.java

@@ -1,9 +1,6 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import com.ekexiu.portal.po.Demand;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
@@ -28,7 +25,9 @@ import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Demand;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@DAO
public abstract class DemandDao {
@@ -123,6 +122,11 @@ public abstract class DemandDao {
	@OrderBy(" ORDER BY INVALID_DAY ASC")
	public abstract PageQueryResult<Demand> pageQueryOrderByInvalidDayAsc(Connection con,@Nullable String state, @Nullable String source,@Nullable String  cost, @Nullable String duration, 
			@GroupSqlColumn(value={"TITLE LIKE ?","DESCP LIKE ?","ORG_NAME LIKE ?","CREATOR IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)"},handlerClass=StringHandler.class,isAnd=false ,force =false)  @Nullable String key,int pageSize,int pageNo) throws SQLException;
	@PageSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC")
	public abstract PageQueryResult<Demand> pageQueryOrderByModifyTimeDesc(Connection con,@Nullable String state, @Nullable String source,@Nullable String  cost, @Nullable String duration,
			@GroupSqlColumn(value={"TITLE LIKE ?","DESCP LIKE ?","ORG_NAME LIKE ?","CREATOR IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)"},handlerClass=StringHandler.class,isAnd=false ,force =false)  @Nullable String key,int pageSize,int pageNo) throws SQLException;
	
    
	
@@ -150,7 +154,7 @@ public abstract class DemandDao {
//	@SelectList
//	@OrderBy("ORDER BY CREATE_TIME DESC")
//	public abstract List<Demand> queryForOrg(Connection con,String orgId)throws SQLException;
//	
//	
//	@SelectList
//	@OrderBy("ORDER BY CREATE_TIME DESC")
//	public abstract List<Demand> queryByDemander(Connection con,String demander)throws SQLException;

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

@@ -113,7 +113,18 @@ public class Console {
            throws SQLException {
        PageQueryResult<ButtedProfessorInfo> ret = new PageQueryResult<ButtedProfessorInfo>();
        if (pid != null) {
            ret = this.platformDao.queryButtedProfessorInfo(con, pid,name, pageSize, pageNo);
            ret = this.platformDao.queryButtedProfessorInfo(con, pid, name == null ? null : ("%" + name + "%"), pageSize, pageNo);
        }
        return ret;
    }
    @Get
    @Path("/pqButtedOrg")
    public PageQueryResult<ButtedOrgInfo> pageQueryButtedOrg(@JdbcConn Connection con,@Nullable String pid,@Nullable String name, int pageSize, int pageNo)
            throws SQLException {
        PageQueryResult<ButtedOrgInfo> ret = new PageQueryResult<ButtedOrgInfo>();
        if (pid != null) {
            ret = this.platformDao.queryButtedOrgInfo(con, pid, name == null ? null : ("%" + name + "%"), pageSize, pageNo);
        }
        return ret;
    }

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

@@ -223,4 +223,10 @@ public interface PlatformDao {
	@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;
	@PageQuery
	@OrderBy(value = "ORDER BY BUTTE_TIME DESC,ID ASC")
	@Exclude({"descp"})
	PageQueryResult<ButtedOrgInfo> queryButtedOrgInfo(Connection con,
																  @SqlColumn(handlerClass = StringHandler.class, value = { "B.PID=?" }) String pid,@Nullable @SqlColumn(handlerClass = StringHandler.class, value = { "O.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
}

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

@@ -359,7 +359,7 @@ public class PlatformService {
	}
	@Post
	@Path("/buttedOrg/delete")
		@Path("/buttedOrg/delete")
	public int buttedOrgDelete(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "oid", valueClass = String.class) }) ButtedOrg po) throws SQLException {
		return this.platformDao.delete(con, po);

src/main/java/com/ekexiu/portal/service/ArticleService.java

@@ -906,16 +906,16 @@ public class ArticleService {
	}
	@Get
	@Path("/pageQueryPublish")
	public PageQueryResult<Article> pageQueryPublish(@JdbcConn Connection con, String ownerId,String articleType,@Nullable String key, @DefaultValue("10") int pageSize,
	@Path("/pageQuery")
	public PageQueryResult<Article> pageQueryPublish(@JdbcConn Connection con, String ownerId,String articleType,@Nullable String[] status,@Nullable String key, @DefaultValue("10") int pageSize,
														@DefaultValue("1") int pageNo) throws SQLException {
		return this.articleDao.pageQueryPublish(con, ownerId,articleType,key, pageSize, pageNo);
		return this.articleDao.pageQueryPublish(con, ownerId,articleType,status, key == null ? null : ("%" + key + "%"), pageSize, pageNo);
	}
	@Get
	@Path("/qaPublish")
	public List<Article> queryPublish(@JdbcConn Connection con, String ownerId, @DefaultValue("\"z\"")String publishTime, @DefaultValue("\"z\"") String articleId,String articleType,@Nullable String key, int rows) throws SQLException {
		return this.articleDao.queryPublish(con, ownerId, publishTime, articleId, articleType,key, rows);
	@Path("/qa")
	public List<Article> queryPublish(@JdbcConn Connection con, String ownerId, @DefaultValue("\"z\"")String publishTime, @DefaultValue("\"z\"") String articleId,String articleType,@Nullable String[] status,@Nullable String key, int rows) throws SQLException {
		return this.articleDao.queryPublish(con, ownerId, publishTime, articleId, articleType,status, key == null ? null : ("%" + key + "%"), rows);
	}
	@Get

src/main/java/com/ekexiu/portal/service/DemandService.java

@@ -394,6 +394,9 @@ public class DemandService {
	@Path("/search/platform")
	public PageQueryResult<Demand> query(@JdbcConn Connection con, @Nullable String state, @Nullable String source,@Nullable String  cost, @Nullable String duration, boolean byCreateTime, @Nullable String key, @DefaultValue("1") int pageNo,
			@DefaultValue("5") int pageSize) throws SQLException {
		if(("2").equals(state)){
			return this.demandDao.pageQueryOrderByModifyTimeDesc(con, state, source, cost, duration, key, pageSize, pageNo);
		}
		if(byCreateTime){
			return this.demandDao.pageQueryOrderByCreateTimeDesc(con, state, source, cost, duration, key, pageSize, pageNo);
		}else{