Merge branch 'feature-canvas' into 'developer'

Feature canvas

See merge request !2427

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

@@ -518,7 +518,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
     public void doPlanSendInfo(Long ownerLogId) {
         logger.info("开始群群发统计{}", ownerLogId);
         TabGroupChatPlanOwnerLog ownerLog = this.groupChatPlanOwnerLogService.getById(ownerLogId);
-        if (ownerLog.getSendStatus() == 2) {
+        if (ownerLog.getSendStatus() == 2 && null != ownerLog.getSendTime() && ownerLog.getSendTime().getTime() < System.currentTimeMillis()+1000*60*60) {
             logger.info("已统计过");
             return;
         }

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

@@ -112,6 +112,11 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
         Long planId = log.getPlanId() ;
         GroupChatPlanBO plan = this.groupChatPlanService.getById(planId) ;
         dto.setPlanName(plan.getName());
+        if(dto.getSendStatus()==1) {
+            if(plan.getSendFlag()==0 || plan.getEndTime().getTime() < System.currentTimeMillis()) {
+                dto.setSendStatus(0);
+            }
+        }
         return ServiceResponse.success(dto);
     }