filtering on template name added

This commit is contained in:
fred-fri 2012-05-03 10:33:37 +09:00
parent 12c06a87aa
commit d0aac89dc3

@ -45,7 +45,7 @@ public class ChecklistTemplateServiceImpl extends AbstractQueryService<CheckList
return checklistTemplateRepo.findAll(pageable);
}
else {
return checklistTemplateRepo.findAll(filterStringIsCreatorName(filterString), pageable);
return checklistTemplateRepo.findAll(filterStringIsCreatorName(filterString).or(filterStringIsChecklistTemplateName(filterString)), pageable);
}
}
@ -55,11 +55,15 @@ public class ChecklistTemplateServiceImpl extends AbstractQueryService<CheckList
return checklistTemplateRepo.count();
}
else {
return checklistTemplateRepo.count(filterStringIsCreatorName(filterString));
return checklistTemplateRepo.count(filterStringIsCreatorName(filterString).or(filterStringIsChecklistTemplateName(filterString)));
}
}
private BooleanExpression filterStringIsCreatorName(String filterString){
return QCheckListTemplate.checkListTemplate.creator.firstName.contains(filterString).or(QCheckListTemplate.checkListTemplate.creator.lastName.contains(filterString));
}
private BooleanExpression filterStringIsChecklistTemplateName(String filterString){
return QCheckListTemplate.checkListTemplate.name.contains(filterString);
}
}