Merge branch 'feature-canvas' into 'master'

Feature canvas

See merge request !2485

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

@@ -577,6 +577,9 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         for (QywxSendMessageResultDTO item : list) {
             TabGroupChatPlanLog entity = new TabGroupChatPlanLog();
             sendTime = item.getSendTime();
+            if(null == sendTime) {
+                continue;
+            }
             String wxChatId = item.getChatId();
             // 如果企微的发送时间晚于计划的结束时间,不记录此类数据
             if (sendTime.after(plan.getEndTime())) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/haoban/GroupChatPlanController.java

@@ -219,7 +219,7 @@ public class GroupChatPlanController {
                 Map<String,String> map = new HashMap<>() ;
                 map.put("ownerLogId",ownerLogId+"") ;
                 mq.setParams(map);
-                this.haobanCommonMQApiService.putCommonDelayMessage(mq, 0);
+                this.haobanCommonMQApiService.putCommonDelayMessage(mq, 15);
             }
             ownerInfo.put("dataGetTime",owner.getDataGetTime());
             retMap.put("ownerInfo", ownerInfo);