REQ-3828: 待办添加查询参数
This commit is contained in:
parent
2dcc3455e4
commit
1c24c88192
@ -151,6 +151,7 @@ public class TodoRangeQueryService {
|
||||
PendingMessagePageRequest request, List<String> templateCodes) {
|
||||
Date startingAt = DateFormatUtil.toDate(LocalDateTime.now().minusDays(90));
|
||||
LambdaQueryWrapper<TodoBusiness> query = businessQuery(request.getTitle(), true)
|
||||
.in(CollectionUtils.isNotEmpty(request.getTemplateCodes()), TodoBusiness::getTemplateCode, request.getTemplateCodes())
|
||||
.eq(TodoBusiness::getPromoterPersonId, request.getPersonId())
|
||||
.eq(TodoBusiness::getIsDelete, TableIsDeleteEnum.NORMAL.value)
|
||||
.gt(TodoBusiness::getCreateAt, startingAt)
|
||||
@ -186,6 +187,7 @@ public class TodoRangeQueryService {
|
||||
LambdaQueryWrapper<Todo> query = todoQuery(query(Todo.class), ouInfo, ouCollector)
|
||||
// 查询的待办类型: COPIED_TO_ME, EXECUTABLE
|
||||
.eq(Todo::getType, request.determineToDoType())
|
||||
.in(CollectionUtils.isNotEmpty(request.getTemplateCodes()), Todo::getTemplateCode, request.getTemplateCodes())
|
||||
.eq(Todo::getExecutorPersonId, request.getPersonId())
|
||||
//判断是否支持批量过滤
|
||||
.eq(request.getSupportBatchProcess() != null, Todo::getSupportBatchProcess, request.getSupportBatchProcess())
|
||||
|
||||
@ -23,6 +23,7 @@ import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @description
|
||||
@ -51,6 +52,10 @@ public class PendingMessagePageRequest extends PageRequest implements ClientRequ
|
||||
* 应用终端
|
||||
*/
|
||||
private AppTerminalTypeEnum appTerminalType;
|
||||
/**
|
||||
* 模板编码集合
|
||||
*/
|
||||
private Set<String> templateCodes;
|
||||
/**
|
||||
* 当前登录账户的自然id(前端不care)
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user