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

REQ-2595-调整待办查询错误问题

Browse Source
This commit is contained in:
yangqicheng 2024-11-13 16:42:04 +08:00
parent dfae6a6074
commit a1a547e028
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,6 +252,8 @@ public class TodoSimpleQueryService {
valuableExecutors.add(executor);
}
}
} else {
valuableExecutors.add(executor);
}
}
if (CollectionUtils.isEmpty(valuableExecutors)) {
@ -262,7 +264,7 @@ public class TodoSimpleQueryService {
IPage<Todo> page = todoDao.lambdaQuery()
.in(CollectionUtils.isNotEmpty(request.getIdentityCodes()), Todo::getIdentityCode, request.getIdentityCodes())
.in(CollectionUtils.isNotEmpty(valuableTempCodes), Todo::getTemplateCode, request.getTemplateCodes())
.in(CollectionUtils.isNotEmpty(valuableTempCodes), Todo::getTemplateCode, valuableTempCodes)
.in(CollectionUtils.isNotEmpty(request.getBizCodes()), Todo::getBizCode, request.getBizCodes())
.in(CollectionUtils.isNotEmpty(request.getStates()), Todo::getState, request.getStates())
.likeRight(StringUtils.isNotBlank(request.getTitleLike()), Todo::getTitle, request.getTitleLike())

32
msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/SimplePageQueryStateEnum.java Normal file
View File

@ -0,0 +1,32 @@
package cn.axzo.msg.center.service.enums;
import lombok.Getter;
@Getter
public enum SimplePageQueryStateEnum {
/**
* 已处理
*/
COMPLETED(1, "已处理"),
/**
* 已终止
*/
ABORTED(2, "已终止"),
/**
* 已撤销
*/
RETRACT(3, "已撤销"),
/**
* 待处理
*/
HAS_BEEN_SENT(4, "待处理");
private final int code;
private final String desc;
SimplePageQueryStateEnum(int code, String desc) {
this.code = code;
this.desc = desc;
}
}