REQ-2135: search todo title
This commit is contained in:
parent
1a75e07006
commit
6e46b45a10
@ -100,6 +100,7 @@ public class TodoRangeQueryService {
|
||||
.eq(TodoBusiness::getIsDelete, TableIsDeleteEnum.NORMAL.value)
|
||||
.gt(TodoBusiness::getCreateAt, startingAt)
|
||||
.in(TodoBusiness::getTemplateCode, templateCodes)
|
||||
.like(StringUtils.isNotBlank(request.getTitle()), TodoBusiness::getTitle, request.getTitle())
|
||||
.eq(request.getBizFinalState() != null, TodoBusiness::getBizFinalState, request.getBizFinalState());
|
||||
PageQuerySort.TODO_BUSINESS.appendSortExpr(request, query);
|
||||
return queryAndAnalysis(getAnalyzeBusiness(request), () -> {
|
||||
@ -130,6 +131,7 @@ public class TodoRangeQueryService {
|
||||
// 查询的待办类型: COPIED_TO_ME, EXECUTABLE
|
||||
.eq(Todo::getType, request.determineToDoType())
|
||||
.eq(Todo::getExecutorPersonId, request.getPersonId())
|
||||
.like(StringUtils.isNotBlank(request.getTitle()), Todo::getTitle, request.getTitle())
|
||||
.in(CollectionUtils.isNotEmpty(businessIdsByLike), Todo::getTodoBusinessId, businessIdsByLike)
|
||||
// set hide
|
||||
.and(nested -> nested
|
||||
@ -277,13 +279,10 @@ public class TodoRangeQueryService {
|
||||
|
||||
// helper
|
||||
|
||||
private LambdaQueryWrapper<TodoBusiness> businessQuery(String title) {
|
||||
private LambdaQueryWrapper<TodoBusiness> businessQuery(String searchPromoterName) {
|
||||
return query(TodoBusiness.class)
|
||||
.eq(TodoBusiness::getIsDelete, TableIsDeleteEnum.NORMAL.value)
|
||||
.and(StringUtils.isNotBlank(title), nested -> nested
|
||||
.like(TodoBusiness::getTitle, title)
|
||||
.or()
|
||||
.like(TodoBusiness::getPromoterName, title));
|
||||
.like(StringUtils.isNotBlank(searchPromoterName), TodoBusiness::getPromoterName, searchPromoterName);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<Todo> todoQuery(Long ouId) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user