wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
xudawei 2024-10-09 10:20:33 +08:00
commit ec2d053c46
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java
View File

@ -128,11 +128,12 @@ public class TodoSimpleQueryService {
} }
public List<PendingMessageSimpleDTO> getTodosSimple(GetTodoRequest request) { public List<PendingMessageSimpleDTO> getTodosSimple(GetTodoRequest request) {
//todo
List<Todo> todos = todoDao.lambdaQuery() List<Todo> todos = todoDao.lambdaQuery()
.in(CollectionUtils.isNotEmpty(request.getIdentityCodes()), Todo::getIdentityCode, request.getIdentityCodes()) .in(CollectionUtils.isNotEmpty(request.getIdentityCodes()), Todo::getIdentityCode, request.getIdentityCodes())
.in(CollectionUtils.isNotEmpty(request.getTemplateCodes()), Todo::getTemplateCode, request.getTemplateCodes()) .in(CollectionUtils.isNotEmpty(request.getTemplateCodes()), Todo::getTemplateCode, request.getTemplateCodes())
.in(CollectionUtils.isNotEmpty(request.getBizCodes()), Todo::getBizCode, request.getBizCodes()) .in(CollectionUtils.isNotEmpty(request.getBizCodes()), Todo::getBizCode, request.getBizCodes())
.in(CollectionUtils.isNotEmpty(request.getExecutorPersonIds()), Todo::getExecutorPersonId, request.getExecutorPersonIds()) //.in(CollectionUtils.isNotEmpty(request.getExecutorPersonIds()), Todo::getExecutorPersonId, request.getExecutorPersonIds())
.in(CollectionUtils.isNotEmpty(request.getStates()), Todo::getState, request.getStates()) .in(CollectionUtils.isNotEmpty(request.getStates()), Todo::getState, request.getStates())
.last("LIMIT " + cfg.getGetTodoSimpleSize()) .last("LIMIT " + cfg.getGetTodoSimpleSize())
.list(); .list();

11
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetTodoRequest.java
View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.List;
import java.util.Set; import java.util.Set;
/** /**
@ -16,8 +17,16 @@ public class GetTodoRequest {
private Set<String> identityCodes; private Set<String> identityCodes;
private Set<String> templateCodes; private Set<String> templateCodes;
private Set<String> bizCodes; private Set<String> bizCodes;
private Set<Long> executorPersonIds;
private Set<PendingMessageStateEnum> states; private Set<PendingMessageStateEnum> states;
private List<Executor> executors;
@Setter
@Getter
public static class Executor {
private Long ouId;
private Long workspaceId;
private List<Long> personIds;
}
@Override @Override
public String toString() { public String toString() {