计划详情

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

@@ -311,6 +311,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
     public void stop(String clerkId, String clerkName, Long planId) {
         this.groupChatPlanMapper.stopById(planId, clerkId, clerkName);
         logger.info("触发统计");
+        this.putMQForData(planId);
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -33,6 +34,7 @@ import com.gic.haoban.manage.api.service.MaterialApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService;
 import com.gic.haoban.manage.web.utils.CreatorUtils;
+import com.gic.haoban.manage.web.vo.chat.ChatOwnerVO;
 import com.gic.haoban.manage.web.vo.chat.GroupChatPlanVO;
 
 /**
@@ -156,12 +158,26 @@ public class GroupChatPlanController {
         }
         // 查询素材列表
         List<MaterialDTO> materials = materialApiService.listMaterialByIds(materialIdList);
-        String[] jsonArr = plan.getStaffIdList().split(",");
-        List<String> staffIds = Arrays.asList(jsonArr);
-        List<StaffDTO> staffList = this.staffApiService.listByIds(staffIds);
+        
+        GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO() ;
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        BasePageInfo basePageInfo = new BasePageInfo();
+        basePageInfo.setPageNum(1);
+        basePageInfo.setPageNum(10000);
+        ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> ownerResp = this.groupChatPlanApiService.listOwnerLogPage(planId, qdto, basePageInfo) ;
         GroupChatPlanVO vo = EntityUtil.changeEntityByJSON(GroupChatPlanVO.class, plan);
         vo.setMaterialIdList(materials);
-        vo.setOwnerList(staffList);
+        if(ownerResp.isSuccess()) {
+            List<GroupChatPlanOwnerLogDTO> list = ownerResp.getResult().getResult() ;
+            List<ChatOwnerVO> ownerList = list.stream().map(dto->{
+                ChatOwnerVO owner = new ChatOwnerVO();
+                owner.setStaffId(dto.getStaffId());
+                owner.setStaffName(dto.getStaffName());
+                return owner ;
+            }).collect(Collectors.toList()) ;
+            vo.setOwnerList(ownerList);
+        }
         return RestResponse.successResult(vo);
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/ChatOwnerVO.java

+package com.gic.haoban.manage.web.vo.chat;
+
+import java.io.Serializable;
+
+public class ChatOwnerVO implements Serializable {
+
+    /**
+    * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+    */
+    private static final long serialVersionUID = -5715186253031695819L;
+    private String staffId;
+    private String staffName;
+    private int openConcatFlag = 0;
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public int getOpenConcatFlag() {
+        return openConcatFlag;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public void setOpenConcatFlag(int openConcatFlag) {
+        this.openConcatFlag = openConcatFlag;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatPlanVO.java

@@ -54,13 +54,13 @@ public class GroupChatPlanVO implements Serializable{
     // 1代发送 2已发送
     private Integer sendFlag;
     private List<MaterialDTO> MaterialIdList ;
-    private List<StaffDTO> ownerList ;
-
-	public List<StaffDTO> getOwnerList() {
+    private List<ChatOwnerVO> ownerList ;
+    
+    public List<ChatOwnerVO> getOwnerList() {
         return ownerList;
     }
 
-    public void setOwnerList(List<StaffDTO> ownerList) {
+    public void setOwnerList(List<ChatOwnerVO> ownerList) {
         this.ownerList = ownerList;
     }