From 1c24c88192d7fbe740771dfe279c20a8f26ae5b6 Mon Sep 17 00:00:00 2001 From: yanglin Date: Thu, 26 Dec 2024 09:57:56 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3828:=20=E5=BE=85=E5=8A=9E=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/message/service/todo/TodoRangeQueryService.java | 2 ++ .../service/pending/request/PendingMessagePageRequest.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java index 1c2d2412..1f5a25d5 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java @@ -151,6 +151,7 @@ public class TodoRangeQueryService { PendingMessagePageRequest request, List templateCodes) { Date startingAt = DateFormatUtil.toDate(LocalDateTime.now().minusDays(90)); LambdaQueryWrapper 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 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()) diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java index 3bb1ac2c..7c188ea4 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java @@ -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 templateCodes; /** * 当前登录账户的自然id(前端不care) */