通知

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/notify/dto/NoticeMessageInfoDTO.java

@@ -78,9 +78,22 @@ public class NoticeMessageInfoDTO implements Serializable {
     private String pageType;
 
     /**
+     * 关联的具体业务消息id
+     */
+    private String relationId;
+
+    /**
      */
     private static final long serialVersionUID = 1L;
 
+    public String getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(String relationId) {
+        this.relationId = relationId;
+    }
+
     public String getPageType() {
         return pageType;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -38,10 +38,7 @@ public enum NoticeMessageTypeEnum {
     GROUP_CHAT_PLAN(2015, "社群群发任务通知", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanGroupChatPlan", "/pages/route/index?pageType=", "hbapp_canvas_group_send", "haobanGroupChatPlan", "haobanNotice"),
     MASS_GROUP_SEND_PLAN(2016, "客户群发任务通知", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanMassGroupSendPlan", "/pages/route/index?pageType=", "hbapp_canvas_custom_send", "haobanMassGroupSendPlan", "haobanNotice"),
     TEL_TASK_CANVAS(2017, "话务任务通知", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTelTaskCanvas", "/pages/route/index?pageType=", "hbapp_canvas_task", "haobanTelTaskCanvas", "haobanNotice"),
-    HB_TASK_TO_DO_LIST_NOTICE_ALL(2018, "任务执行提醒", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTaskTodoNotice", "/pages/route/index?pageType=", "workbench", "haobanTaskTodoNotice", "haobanNotice"),
-    HB_TASK_TO_DO_LIST_NOTICE_CHAT(2019, "任务执行提醒", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTaskTodoNotice", "/pages/route/index?pageType=", "hbapp_canvas_group_send_list", "haobanTaskTodoNotice", "haobanNotice"),
-    HB_TASK_TO_DO_LIST_NOTICE_MASS(2020, "任务执行提醒", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTaskTodoNotice", "/pages/route/index?pageType=", "hbapp_canvas_custom_send_list", "haobanTaskTodoNotice", "haobanNotice"),
-    HB_TASK_TO_DO_LIST_NOTICE_TEL_TASK(2021, "任务执行提醒", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTaskTodoNotice", "/pages/route/index?pageType=", "hbapp_canvas_task_list", "haobanTaskTodoNotice", "haobanNotice"),
+    HB_TASK_TO_DO_LIST_NOTICE(2018, "任务执行提醒", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTaskTodoNotice", "/pages/route/index?pageType=", "", "haobanTaskTodoNotice", "haobanNotice"),
 
 
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/NoticeMessageApiServiceImpl.java

@@ -455,7 +455,20 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
         if (retPage != null && CollectionUtils.isNotEmpty(tPage.getResult())) {
             tPage.getResult().forEach(mid -> {
                 NoticeMessageTypeEnum messageTypeEnum = NoticeMessageTypeEnum.getByType(mid.getMessageType());
+                if(messageTypeEnum.getMessageCode().equals("haobanTaskTodoNotice")) {
+                    String relationId = mid.getRelationId() ;
+                    if("chat".equals(relationId)) {
+                        mid.setPageType("hbapp_canvas_group_send_list");
+                    }else if("mass".equals(relationId)) {
+                        mid.setPageType("hbapp_canvas_custom_send_list");
+                    }else if("tel".equals(relationId)) {
+                        mid.setPageType("hbapp_canvas_task_list");
+                    }else {
+                        mid.setPageType("workbench");
+                    }
+                }else {
                     mid.setPageType(messageTypeEnum.getPageType());
+                }
             });
         }
         return ServiceResponse.success(tPage);