专家搜索接口添加按专家地址字段搜索。

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

@@ -191,7 +191,7 @@ public abstract class ProfessorDao {
					"" + "ORG_ID IN(SELECT ID FROM ORGANIZATION WHERE NAME LIKE ?)", "NAME LIKE ?" }, handlerClass = StringHandler.class) String key,
			int pageSize, int pageNo) throws SQLException;
	public PageQueryResult<Professor> query(Connection con, @Nullable String key, String subject, String industry, int pageSize, int pageNo)
	public PageQueryResult<Professor> query(Connection con, @Nullable String key, String subject, String industry, String address, int pageSize, int pageNo)
			throws SQLException {
		org.jfw.util.PageQueryResult<com.ekexiu.portal.po.Professor> _result = new org.jfw.util.PageQueryResult<com.ekexiu.portal.po.Professor>();
@@ -204,12 +204,16 @@ public abstract class ProfessorDao {
		}
		boolean hasSubject = null != subject;
		boolean hasIndustry = null != industry;
		boolean hasAddress = null != address;
		if (hasSubject) {
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
		}
		if (hasIndustry) {
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(INDUSTRY LIKE ?)");
		}
		if (hasAddress) {
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
		}
		StringBuilder whereSql = sql;
		sql = new StringBuilder();
@@ -232,6 +236,9 @@ public abstract class ProfessorDao {
			if (hasIndustry) {
				ps.setString(paramIndex++, industry);
			}
			if (hasAddress) {
				ps.setString(paramIndex++, address);
			}
			_result.setPageSize(pageSize);
			java.sql.ResultSet _pageRs = ps.executeQuery();
			try {
@@ -297,6 +304,9 @@ public abstract class ProfessorDao {
			if (hasIndustry) {
				ps.setString(paramIndex++, industry);
			}
			if (hasAddress) {
				ps.setString(paramIndex++, address);
			}
			java.sql.ResultSet rs = ps.executeQuery();
			try {
				java.util.List<com.ekexiu.portal.po.Professor> _m_11 = new java.util.ArrayList<com.ekexiu.portal.po.Professor>();

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

@@ -237,14 +237,15 @@ public class ProfessorService {
	}
	@Get
	@Path("/pq")
	PageQueryResult<Professor> query(@JdbcConn(false) Connection con,@Nullable String key,@Nullable String subject,@Nullable String industry, @DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
	PageQueryResult<Professor> query(@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{
	//	System.out.println("key==["+(key==null?"":key)+"]");
	//	System.out.println("subject==["+(subject==null?"":subject)+"]");
	//	System.out.println("industry==["+(industry==null?"":industry)+"]");
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";
		if(null!=industry)industry="%"+industry+"%";
		return this.professorDao.query(con, key, subject, industry, pageSize, pageNo);
		if(null!=industry) industry="%"+industry+"%";
		if(null!=address) address="%"+address+"%";
		return this.professorDao.query(con, key, subject, industry, address, pageSize, pageNo);
	}
	
	@Get