|
@ -462,12 +462,13 @@ public class ProfessorService {
|
462
|
462
|
}
|
463
|
463
|
List<TestService.TypeaheadItem> ret = new ArrayList<>(s);
|
464
|
464
|
final String finalKey = q;
|
465
|
|
List<List<String>> typeahead = JdbcUtil.queryList(con, "SELECT p.name as name,o.name as org_name ,p.id as id FROM professor p LEFT JOIN organization o on o.id = p.org_id WHERE p.name LIKE ?", new ResultSetExtractor<List<String>>() {
|
|
465
|
List<List<String>> typeahead = JdbcUtil.queryList(con, "SELECT p.name as name,o.name as org_name ,p.office as office,p.id as id FROM professor p LEFT JOIN organization o on o.id = p.org_id WHERE p.name LIKE ?", new ResultSetExtractor<List<String>>() {
|
466
|
466
|
@Override
|
467
|
467
|
public List<String> extractData(ResultSet resultSet) throws SQLException {
|
468
|
468
|
List<String> strings = new ArrayList<>();
|
469
|
469
|
strings.add(resultSet.getString("name"));
|
470
|
470
|
strings.add(resultSet.getString("org_name"));
|
|
471
|
strings.add(resultSet.getString("office"));
|
471
|
472
|
strings.add(resultSet.getString("id"));
|
472
|
473
|
return strings;
|
473
|
474
|
}
|
|
@ -480,8 +481,8 @@ public class ProfessorService {
|
480
|
481
|
|
481
|
482
|
for (List<String> s1 : typeahead) {
|
482
|
483
|
TestService.TypeaheadItem thi = new TestService.TypeaheadItem();
|
483
|
|
thi.setCode(s1.get(2));
|
484
|
|
thi.setCaption(s1.get(0)+","+s1.get(1));
|
|
484
|
thi.setCode(s1.get(3));
|
|
485
|
thi.setCaption(s1.get(0) + "," + s1.get(1) + "," + s1.get(2));
|
485
|
486
|
ret.add(thi);
|
486
|
487
|
}
|
487
|
488
|
return ret;
|