From 8920a3145c68042e7bf1f17233d9c232b8bbf3a8 Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Fri, 1 Nov 2024 09:55:14 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2595-=E5=BE=85=E5=8A=9E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0title=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/service/todo/TodoSimpleQueryService.java | 1 + .../service/pending/request/GetTodoPageRequest.java | 1 + .../service/pending/response/PendingMessageCountDTO.java | 8 +------- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java index ab58b37e..131e7dd7 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java @@ -188,6 +188,7 @@ public class TodoSimpleQueryService { .in(CollectionUtils.isNotEmpty(request.getTemplateCodes()), Todo::getTemplateCode, request.getTemplateCodes()) .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()) .and(CollectionUtils.isNotEmpty(request.getExecutors()), wrapper -> { for (GetTodoRequest.Executor executor : request.getExecutors()) { wrapper.or() diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetTodoPageRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetTodoPageRequest.java index 6ef35109..197b359a 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetTodoPageRequest.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/GetTodoPageRequest.java @@ -20,6 +20,7 @@ import java.util.Set; @AllArgsConstructor public class GetTodoPageRequest extends PageRequest { + private String titleLike; private BizCategoryEnum bizCategory; private Set identityCodes; private Set templateCodes; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageCountDTO.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageCountDTO.java index e2866225..a269e2ad 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageCountDTO.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageCountDTO.java @@ -3,18 +3,12 @@ package cn.axzo.msg.center.service.pending.response; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.Setter; import java.util.ArrayList; import java.util.List; -/** - * @author yanglin - */ -@Setter -@Getter +@Data @AllArgsConstructor @NoArgsConstructor @Builder