diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java index ecaa18cd..6a5d1e2e 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java @@ -8,6 +8,7 @@ import cn.axzo.msg.center.message.service.todo.TodoRangeQueryService; import cn.axzo.msg.center.message.service.todo.TodoSimpleQueryService; import cn.axzo.msg.center.message.service.todo.manage.TodoManager; import cn.axzo.msg.center.service.enums.TerminalTypeEnum; +import cn.axzo.msg.center.service.enums.TodoType; import cn.axzo.msg.center.service.pending.client.PendingMessageClient; import cn.axzo.msg.center.service.pending.request.CompletePendingBySubCodeRequest; import cn.axzo.msg.center.service.pending.request.CompletePendingMessageByIdRequest; @@ -101,9 +102,9 @@ public class PendingMessageNewController implements PendingMessageClient { @Override public CommonResponse getLatestTodoByBiz( - String templateCode, String bizCode, String subBizCode) { + String templateCode, String bizCode, String subBizCode, String todoType) { PendingMessageResponse response = todoSimpleQueryService - .getLatestTodoByBiz(templateCode, bizCode, subBizCode); + .getLatestTodoByBiz(templateCode, bizCode, subBizCode, TodoType.valueOf(todoType)); return CommonResponse.success(response); } 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 2765a8c6..8fddc05b 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 @@ -8,6 +8,7 @@ import cn.axzo.msg.center.domain.entity.PendingRecordAdapter; import cn.axzo.msg.center.domain.entity.Todo; import cn.axzo.msg.center.domain.entity.TodoBusiness; import cn.axzo.msg.center.service.enums.TerminalTypeEnum; +import cn.axzo.msg.center.service.enums.TodoType; import cn.axzo.msg.center.service.pending.request.PendingMessageByBizCodeRequest; import cn.axzo.msg.center.service.pending.request.PendingMessageQueryRequest; import cn.axzo.msg.center.service.pending.response.PendingMessageResponse; @@ -21,7 +22,6 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.List; import java.util.Map; @@ -74,9 +74,10 @@ public class TodoSimpleQueryService { .toResponse(terminalType); } - public PendingMessageResponse getLatestTodoByBiz(String templateCode, String bizCode, String subBizCode) { + public PendingMessageResponse getLatestTodoByBiz( + String templateCode, String bizCode, String subBizCode, TodoType todoType) { Todo todo = todoDao - .getLatestByBiz(templateCode, bizCode, subBizCode) + .getLatestByBiz(templateCode, bizCode, subBizCode, todoType) .orElse(null); if (todo == null) return null; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java index 8c04ee0c..3095fbce 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java @@ -123,7 +123,8 @@ public interface PendingMessageClient { CommonResponse getLatestTodoByBiz( @RequestParam(value = "templateCode", required = false) String templateCode, @RequestParam(value = "bizCode", required = false) String bizCode, - @RequestParam(value = "subBizCode", required = false) String subBizCode); + @RequestParam(value = "subBizCode", required = false) String subBizCode, + @RequestParam(value = "todoType") String todoTyp); /** * ๅ‘้€ไปฃๅŠž diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/TodoDao.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/TodoDao.java index 5b6d4f71..57240d32 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/TodoDao.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/TodoDao.java @@ -4,6 +4,7 @@ import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum; import cn.axzo.msg.center.dal.mapper.TodoMapper; import cn.axzo.msg.center.domain.entity.Todo; import cn.axzo.msg.center.domain.entity.TodoBusiness; +import cn.axzo.msg.center.service.enums.TodoType; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -49,12 +50,13 @@ public class TodoDao extends ServiceImpl { .list(); } - public Optional getLatestByBiz(@Nullable String templateCode, - String bizCode, String subBizCode) { + public Optional getLatestByBiz( + @Nullable String templateCode, String bizCode, String subBizCode, TodoType todoType) { if (StringUtils.isBlank(bizCode) && StringUtils.isBlank(subBizCode)) return Optional.empty(); Todo todo = lambdaQuery() .eq(Todo::getIsDelete, TableIsDeleteEnum.NORMAL.value) + .eq(todoType != null, Todo::getType, todoType) .eq(StringUtils.isNotBlank(templateCode), Todo::getTemplateCode, templateCode) .eq(StringUtils.isNotBlank(bizCode), Todo::getBizCode, bizCode) .eq(StringUtils.isNotBlank(subBizCode), Todo::getSubBizCode, subBizCode)