Explorar el Código

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

zzy.zhiyuan.foxmail %!s(int64=8) %!d(string=hace) años
padre
commit
7fb6a05345

+ 11 - 1
src/main/java/com/ekexiu/portal/dao/ProfessorDao.java

191
					"" + "ORG_ID IN(SELECT ID FROM ORGANIZATION WHERE NAME LIKE ?)", "NAME LIKE ?" }, handlerClass = StringHandler.class) String key,
191
					"" + "ORG_ID IN(SELECT ID FROM ORGANIZATION WHERE NAME LIKE ?)", "NAME LIKE ?" }, handlerClass = StringHandler.class) String key,
192
			int pageSize, int pageNo) throws SQLException;
192
			int pageSize, int pageNo) throws SQLException;
193

193

194
	public PageQueryResult<Professor> query(Connection con, @Nullable String key, String subject, String industry, int pageSize, int pageNo)
194
	public PageQueryResult<Professor> query(Connection con, @Nullable String key, String subject, String industry, String address, int pageSize, int pageNo)
195
			throws SQLException {
195
			throws SQLException {
196

196

197
		org.jfw.util.PageQueryResult<com.ekexiu.portal.po.Professor> _result = new org.jfw.util.PageQueryResult<com.ekexiu.portal.po.Professor>();
197
		org.jfw.util.PageQueryResult<com.ekexiu.portal.po.Professor> _result = new org.jfw.util.PageQueryResult<com.ekexiu.portal.po.Professor>();
204
		}
204
		}
205
		boolean hasSubject = null != subject;
205
		boolean hasSubject = null != subject;
206
		boolean hasIndustry = null != industry;
206
		boolean hasIndustry = null != industry;
207
		boolean hasAddress = null != address;
207
		if (hasSubject) {
208
		if (hasSubject) {
208
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
209
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
209
		}
210
		}
210
		if (hasIndustry) {
211
		if (hasIndustry) {
211
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(INDUSTRY LIKE ?)");
212
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(INDUSTRY LIKE ?)");
212
		}
213
		}
214
		if (hasAddress) {
215
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
216
		}
213

217

214
		StringBuilder whereSql = sql;
218
		StringBuilder whereSql = sql;
215
		sql = new StringBuilder();
219
		sql = new StringBuilder();
232
			if (hasIndustry) {
236
			if (hasIndustry) {
233
				ps.setString(paramIndex++, industry);
237
				ps.setString(paramIndex++, industry);
234
			}
238
			}
239
			if (hasAddress) {
240
				ps.setString(paramIndex++, address);
241
			}
235
			_result.setPageSize(pageSize);
242
			_result.setPageSize(pageSize);
236
			java.sql.ResultSet _pageRs = ps.executeQuery();
243
			java.sql.ResultSet _pageRs = ps.executeQuery();
237
			try {
244
			try {
297
			if (hasIndustry) {
304
			if (hasIndustry) {
298
				ps.setString(paramIndex++, industry);
305
				ps.setString(paramIndex++, industry);
299
			}
306
			}
307
			if (hasAddress) {
308
				ps.setString(paramIndex++, address);
309
			}
300
			java.sql.ResultSet rs = ps.executeQuery();
310
			java.sql.ResultSet rs = ps.executeQuery();
301
			try {
311
			try {
302
				java.util.List<com.ekexiu.portal.po.Professor> _m_11 = new java.util.ArrayList<com.ekexiu.portal.po.Professor>();
312
				java.util.List<com.ekexiu.portal.po.Professor> _m_11 = new java.util.ArrayList<com.ekexiu.portal.po.Professor>();

+ 4 - 3
src/main/java/com/ekexiu/portal/service/ProfessorService.java

237
	}
237
	}
238
	@Get
238
	@Get
239
	@Path("/pq")
239
	@Path("/pq")
240
	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{
240
	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{
241
	//	System.out.println("key==["+(key==null?"":key)+"]");
241
	//	System.out.println("key==["+(key==null?"":key)+"]");
242
	//	System.out.println("subject==["+(subject==null?"":subject)+"]");
242
	//	System.out.println("subject==["+(subject==null?"":subject)+"]");
243
	//	System.out.println("industry==["+(industry==null?"":industry)+"]");
243
	//	System.out.println("industry==["+(industry==null?"":industry)+"]");
244
		if(key!=null) key="%"+key+"%";
244
		if(key!=null) key="%"+key+"%";
245
		if(subject!=null) subject ="%"+subject+"%";
245
		if(subject!=null) subject ="%"+subject+"%";
246
		if(null!=industry)industry="%"+industry+"%";
247
		return this.professorDao.query(con, key, subject, industry, pageSize, pageNo);
246
		if(null!=industry) industry="%"+industry+"%";
247
		if(null!=address) address="%"+address+"%";
248
		return this.professorDao.query(con, key, subject, industry, address, pageSize, pageNo);
248
	}
249
	}
249
	
250
	
250
	@Get
251
	@Get