DMC/scipro
7
0
Fork 0
Code Issues41 Pull Requests9 Actions Projects1 Releases Wiki Activity

trying to make querying by head supervisor name work

Browse Source
This commit is contained in:
fred-fri 2012-05-25 17:38:48 +09:00
parent ba26a17844
commit 68e3a44614
1 changed files with 13 additions and 1 deletions

14
src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectServiceImpl.java

@ -53,7 +53,8 @@ public class ProjectServiceImpl extends AbstractQueryService<Project, Long> impl
@Override @Override
public Page<Project> find(String filterString, Pageable pageable) { public Page<Project> find(String filterString, Pageable pageable) {
return projectRepo.findAll(titleContains(filterString), pageable); // return projectRepo.findAll(titleContains(filterString), pageable);
return projectRepo.findAll(titleContains(filterString).or(headSupervisorFirstNameContains(filterString).or(headSupervisorLastNameContains(filterString))), pageable);
} }
@Override @Override
@ -128,6 +129,17 @@ public class ProjectServiceImpl extends AbstractQueryService<Project, Long> impl
return QProject.project.title.contains(searchTerm); return QProject.project.title.contains(searchTerm);
} }
private BooleanExpression headSupervisorFirstNameContains(String searchTerm){
if (QProject.project.headSupervisor.isNotNull()){
}
return QProject.project.headSupervisor.user.firstName.contains(searchTerm);
}
private BooleanExpression headSupervisorLastNameContains(String searchTerm){
return QProject.project.headSupervisor.user.lastName.contains(searchTerm);
}
private BooleanExpression hasProjectClass(ProjectClass pc) { private BooleanExpression hasProjectClass(ProjectClass pc) {
if (pc != null) if (pc != null)
return QProject.project.projectClass.eq(pc); return QProject.project.projectClass.eq(pc);