Merge branch 'feature/REQ-1073' into 'pre'
feat(待办临时分类管理): https://jira.axzo.cn/browse/REQ-1073?goToView=1 See merge request universal/infrastructure/backend/msg-center-plat!28
This commit is contained in:
commit
0b990157d3
@ -46,6 +46,7 @@ public class PendingMessageBizConfig {
|
||||
|
||||
public List<MsgTempBizCategoryConfig> tempCategoriesConfig() {
|
||||
return Arrays.stream(MsgTempBizCategoryEnum.values())
|
||||
.filter(e -> category.containsKey(e))
|
||||
.map(this::build)
|
||||
.filter(MsgTempBizCategoryConfig::isValid)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
@ -120,6 +120,17 @@ public class PendingMessageServiceImpl implements PendingMessageService {
|
||||
request.setIdentifyTypes(Lists.newArrayList(ReceiveTypeEnum.CM_WORKER));
|
||||
// FIXME: 这里前端可以不传临时的业务分类标识,若不传的话查询配置指定的几个分类的合集
|
||||
Set<Long> relationIds = fetchRelationIdFromRequestOrConfig(request, categoryConfigs);
|
||||
if (CollectionUtils.isEmpty(relationIds)) {
|
||||
log.warn("the tempBizCategory is invalid. {}", request.getTempBizCategory());
|
||||
return PendingMessageStatisticRes.builder()
|
||||
.totalElements(0L)
|
||||
.pageNum(page.getCurrent())
|
||||
.pageSize(page.getSize())
|
||||
.unCompleteCnt(0)
|
||||
.completeCnt(0)
|
||||
.briefResList(Collections.emptyList())
|
||||
.build();
|
||||
}
|
||||
// 这里对前端未传入参的情况做一个兜底
|
||||
Collection<MsgStateEnum> msgStates = CollectionUtils.isEmpty(request.getStates()) ? ALL_WITHOUT_UNSENT :
|
||||
request.getStates();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user