Merge branch 'feature/xgh/202507迭代' into 'developer'

通知数据

See merge request !3072

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

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+public class MassGroupTaskData implements Serializable {
+
+    private int total ;
+
+    private int invalid  ;
+
+    private int overdue ;
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public int getInvalid() {
+        return invalid;
+    }
+
+    public void setInvalid(int invalid) {
+        this.invalid = invalid;
+    }
+
+    public int getOverdue() {
+        return overdue;
+    }
+
+    public void setOverdue(int overdue) {
+        this.overdue = overdue;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatPlanApiService.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.api.service.chat;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.MassGroupTaskData;
 import com.gic.haoban.manage.api.dto.chat.ChatOwnerTotalDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
@@ -93,6 +94,10 @@ public interface GroupChatPlanApiService {
      */
     void noticeTimer(String params) ;
 
+    MassGroupTaskData massMomentTaskData(String enterpriseId , String clerkId , Date date) ;
+
+    MassGroupTaskData massGroupTaskData(String enterpriseId , String clerkId , Date date) ;
+
     Integer getTaskNum(String wxEnterpriseId, String enterpriseId, String storeId, String clerkId, String staffId);
 
 }

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.chat;
 
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
+import com.gic.haoban.manage.api.dto.MassGroupTaskData;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
@@ -47,4 +48,8 @@ public interface GroupChatPlanService {
     void noticeTimer(String params);
 
     Integer getTaskNum(String wxEnterpriseId, String enterpriseId, String storeId, String clerkId, String staffId);
+
+    MassGroupTaskData massMomentTaskData(String enterpriseId, String clerkId, Date date);
+
+    MassGroupTaskData massGroupTaskData(String enterpriseId, String clerkId, Date date);
 }
\ No newline at end of file

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

@@ -13,9 +13,7 @@ import com.gic.canvas.api.dto.node.extract.MaterialExternalResources;
 import com.gic.canvas.api.service.CanvasApiService;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
-import com.gic.haoban.manage.api.dto.CommonMQDTO;
-import com.gic.haoban.manage.api.dto.ContentMaterialDTO;
-import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.dto.chat.*;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
@@ -67,7 +65,6 @@ import com.gic.dubbo.entity.ProviderLocalTag;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.DingUtils;
-import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.api.enums.PendingTaskTypeEnum;
 import com.gic.haoban.manage.api.enums.chat.PlanSendStatusEnum;
@@ -1078,6 +1075,34 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
     }
 
     @Override
+    public MassGroupTaskData massMomentTaskData(String enterpriseId, String clerkId, Date date) {
+        // 朋友圈
+        int momentTotal = this.qwMomentPlanAttendMapper.getTotalTask(enterpriseId,clerkId,date) ;
+        if(momentTotal > 0) {
+            int invalid = this.qwMomentPlanAttendMapper.getInvalidTask(enterpriseId,clerkId,date) ;
+            MassGroupTaskData dto = new MassGroupTaskData();
+            dto.setTotal(momentTotal);
+            dto.setInvalid(invalid);
+            return dto;
+        }
+        return null;
+    }
+
+    @Override
+    public MassGroupTaskData massGroupTaskData(String enterpriseId, String clerkId, Date date) {
+        int total = this.groupChatPlanOwnerLogMapper.getTotalTask(enterpriseId,clerkId,date) ;
+        logger.info("clerkId={}",total);
+        if(total > 0) {
+            int invalid = this.groupChatPlanOwnerLogMapper.getInvalidTask(enterpriseId,clerkId,date) ;
+            MassGroupTaskData dto = new MassGroupTaskData();
+            dto.setTotal(total);
+            dto.setInvalid(invalid);
+            return dto;
+        }
+        return null;
+    }
+
+    @Override
     public Integer getTaskNum(String wxEnterpriseId, String enterpriseId, String storeId, String clerkId, String staffId) {
         ClerkDTO clerkDTO = this.clerkService.getclerkById(clerkId) ;
         if(null == clerkDTO) {

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

 package com.gic.haoban.manage.service.service.out.impl.chat;
 
+import com.gic.haoban.manage.api.dto.MassGroupTaskData;
 import com.gic.haoban.manage.api.qdto.StaffSendResultQDTO;
 import com.gic.haoban.manage.service.service.content.impl.GroupMessageServiceImpl;
 import org.apache.commons.lang3.StringUtils;
@@ -199,6 +200,16 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
     }
 
     @Override
+    public MassGroupTaskData massMomentTaskData(String enterpriseId, String clerkId, Date date) {
+        return this.groupChatPlanService.massMomentTaskData(enterpriseId, clerkId, date);
+    }
+
+    @Override
+    public MassGroupTaskData massGroupTaskData(String enterpriseId, String clerkId, Date date) {
+        return this.groupChatPlanService.massGroupTaskData(enterpriseId, clerkId, date);
+    }
+
+    @Override
     public Integer getTaskNum(String wxEnterpriseId, String enterpriseId, String storeId, String clerkId, String staffId) {
         return this.groupChatPlanService.getTaskNum(wxEnterpriseId,enterpriseId,storeId,clerkId,staffId);
     }