From a9de4e46d701a0105e01f2ebfb65e7d1ce60a2a7 Mon Sep 17 00:00:00 2001 From: luofu Date: Thu, 16 Nov 2023 14:04:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-1507):=20=E5=85=BC=E5=AE=B9CMS?= =?UTF-8?q?=E8=80=81=E7=89=88=E6=9C=AC=E7=9A=84=E5=BE=85=E5=8A=9E=E5=85=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 背景： https://jira.axzo.cn/browse/REQ-1507?goToView=1 修改： 1、兼容CMS老版本的待办入口； 影响： 无 --- .../service/impl/MessageCoreServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java index ff03c638..d6a3331c 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java @@ -32,6 +32,10 @@ import cn.axzo.msg.center.inside.notices.service.MessageRecordService; import cn.axzo.msg.center.inside.notices.service.MessageRelationService; import cn.axzo.msg.center.inside.notices.service.MessageRouterService; import cn.axzo.msg.center.inside.notices.service.RawMessageRecordService; +import cn.axzo.msg.center.message.domain.param.MessageGroupNodeStatisticParam; +import cn.axzo.msg.center.message.service.PendingMessageNewService; +import cn.axzo.msg.center.service.dto.PersonDTO; +import cn.axzo.msg.center.service.enums.AppTerminalTypeEnum; import cn.azxo.framework.common.model.Page; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; @@ -94,6 +98,8 @@ public class MessageCoreServiceImpl implements MessageCoreService { @Resource private RawMessageRecordService rawMessageRecordService; + @Resource + private PendingMessageNewService pendingMessageNewService; public MsgRouteTypeEnum getSystemType(String systemType) { /*String systemType = ContextInfoHolder.get().getSystemAndDeviceInfo().getSystemType();*/ @@ -323,8 +329,12 @@ public class MessageCoreServiceImpl implements MessageCoreService { List states = Lists.newArrayList(MsgStateEnum.HAS_BEEN_SENT, MsgStateEnum.RECEIVED); int generalCnt = rawMessageRecordService.countPersonMessage(request.getPersonId(), MsgTypeEnum.GENERAL_MESSAGE, null, null, states); - int pendingCnt = rawMessageRecordService.countPersonMessage(request.getPersonId(), MsgTypeEnum.PENDING_MESSAGE, - null, null, states); + // 统计待办的数量 + MessageGroupNodeStatisticParam param = new MessageGroupNodeStatisticParam(); + param.setOperator(PersonDTO.builder().id(request.getPersonId()).build()); + param.setTerminalType(AppTerminalTypeEnum.CMS_WEB_PC); + param.setWithIdentify(false); + int pendingCnt = pendingMessageNewService.countUncompleted(param); return new MessageStatisticRes(generalCnt, pendingCnt); }