资源搜索页面添加专家省份和专家认证作为搜索条件。

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

@@ -406,48 +406,49 @@ public abstract class ResourceDao {
	 * @return 按条件返回资源列表(包括资源所有者基本信息)
	 * @throws SQLException
	 */
	public PageQueryResult<Resource> queryPageRes(Connection con,String key,String subject,String industry,String address,int pageSize,int pageNo) throws SQLException{
	public PageQueryResult<Resource> queryPageRes(Connection con,String key,String subject,String industry,
			String province,String address,Integer authentication,int pageSize,int pageNo) throws SQLException{
        int _m_1 = 0;
        PageQueryResult<Resource> _result = new PageQueryResult<Resource>();
        int _m_3 = 1;
        boolean _m_2 = null == key;
        boolean _m_4 = null == subject;
        boolean _m_5 = null == industry;
        boolean _m5 = null == province;
        boolean _m6 = null == address;
        boolean _m7 = null == authentication;
        StringBuilder sql = new StringBuilder();
        boolean _m_7 = true;
        if(!_m_2){
            _m_7 =  false;
            sql.append(" WHERE ((RESOURCE_NAME LIKE ?) OR (SUPPORTED_SERVICES LIKE ?) "
            		+ " OR (RESOURCE.SUBJECT LIKE ?) OR (RESOURCE.INDUSTRY LIKE ?) "
            		+ " OR (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ? OR PROFESSOR.NAME LIKE ?))"
            		+ " OR (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR "
            		+ " WHERE PROFESSOR.PROVINCE LIKE ? OR PROFESSOR.ADDRESS LIKE ? OR PROFESSOR.NAME LIKE ?))"
            		+ " OR (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE ORG_ID "
            		+ " IN(SELECT ORGANIZATION.ID FROM ORGANIZATION WHERE ORGANIZATION.NAME LIKE ?) )) ) ");
        }
        if(!_m_4){
            if(_m_7){
                _m_7 =  false;
                sql.append(" WHERE (RESOURCE.SUBJECT LIKE ?) ");
            }else{
                sql.append(" AND (RESOURCE.SUBJECT LIKE ?) ");
            }
            sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(RESOURCE.SUBJECT LIKE ?)");
        }
        if(!_m_5){
            if(_m_7){
                _m_7 =  false;
                sql.append(" WHERE (RESOURCE.INDUSTRY LIKE ?) ");
            }else{
                sql.append(" AND (RESOURCE.INDUSTRY LIKE ?) ");
            }
            sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(RESOURCE.INDUSTRY LIKE ?)");
        }
        if(!_m5){
        	sql.append(sql.length() > 0 ? " AND " : " WHERE ").
        	append("(RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.PROVINCE LIKE ?))");
        }
        if(!_m6){
        	if(_m_7){
        		_m_7 =  false;
        		sql.append(" WHERE (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?)) ");
        	}else{
        		sql.append(" AND (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?)) ");
        	}
        	sql.append(sql.length() > 0 ? " AND " : " WHERE ").
        	append("(RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?))");
        }
        if(!_m7){
			if(0 == authentication){
				sql.append(sql.length() > 0 ? " AND " : " WHERE ").
				append("(RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.AUTHENTICATION = '0'))");
			}else if(1 == authentication){
				sql.append(sql.length() > 0 ? " AND " : " WHERE ").
				append("(RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.AUTHENTICATION = '1'))");
			}
		}
        StringBuilder _m_6 = sql;
        sql = new StringBuilder();
        sql.append(" SELECT COUNT(1) FROM RESOURCE ");
@@ -464,6 +465,7 @@ public abstract class ResourceDao {
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
            }
            if(!_m_4){
                ps.setString(_m_3++,subject);
@@ -471,6 +473,9 @@ public abstract class ResourceDao {
            if(!_m_5){
                ps.setString(_m_3++,industry);
            }
            if(!_m5){
            	ps.setString(_m_3++,province);
            }
            if(!_m6){
            	ps.setString(_m_3++,address);
            }
@@ -533,6 +538,7 @@ public abstract class ResourceDao {
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
            }
            if(!_m_4){
                ps.setString(_m_3++,subject);
@@ -540,6 +546,9 @@ public abstract class ResourceDao {
            if(!_m_5){
                ps.setString(_m_3++,industry);
            }
            if(!_m5){
            	ps.setString(_m_3++,province);
            }
            if(!_m6){
            	ps.setString(_m_3++,address);
            }

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

@@ -165,11 +165,15 @@ public class ResourceService {
	
	@Get
	@Path("/pqRes")
	public PageQueryResult<Resource> queryPageRes(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry, @Nullable String address, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
	public PageQueryResult<Resource> queryPageRes(@JdbcConn(false) Connection con, @Nullable String key, 
			@Nullable String subject, @Nullable String industry, @Nullable String province, @Nullable String address, 
			@Nullable Integer authentication, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";
		if(industry!=null)industry="%"+industry+"%";
		return this.resourceDao.queryPageRes(con, key, subject, industry, address, pageSize, pageNo);
		if(province!=null)province="%"+province+"%";
		if(address!=null)address="%"+address+"%";
		return this.resourceDao.queryPageRes(con, key, subject, industry, province, address, authentication, pageSize, pageNo);
	}
	
	@Get
@@ -178,6 +182,7 @@ public class ResourceService {
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";
		if(industry!=null)industry="%"+industry+"%";
		if(address!=null)address="%"+address+"%";
		return this.resourceDao.queryPage(con, key, subject, industry, address, pageSize, pageNo);
	}