群发日志

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

@@ -19,6 +19,7 @@ public class TabGroupChatPlanLog implements Serializable{
 	private Long logId;
 	private Long planId;
 	private String wxEnterpriseId;
+	private String staffId ;
 	/**群id*/
 	private Long groupChatId;
 	private Integer sendStatus;
@@ -32,6 +33,14 @@ public class TabGroupChatPlanLog implements Serializable{
 	private Integer deleteFlag ;
 	private String wxChatId3th ;
 
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
     public String getWxChatId3th() {
         return wxChatId3th;
     }

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

@@ -85,7 +85,10 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
             List<String> storeIdList = list.stream().filter(dto -> StringUtils.isNotBlank(dto.getStoreId()))
                     .map(dto -> dto.getStoreId()).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(storeIdList)) {
-                String[] arr = (String[]) storeIdList.toArray();
+                String[] arr = new String[storeIdList.size()] ;
+                for(int i=0;i<storeIdList.size();i++) {
+                    arr[i] = storeIdList.get(i) ;
+                }
                 List<StoreDTO> storeList = this.storeService.getStores(arr);
                 Map<String, StoreDTO> map = storeList.stream()
                         .collect(Collectors.toMap(StoreDTO::getStoreId, dto -> dto, (k1, k2) -> k1));

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

@@ -226,7 +226,10 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
             List<String> storeIdList = list.stream().filter(dto -> StringUtils.isNotBlank(dto.getStoreId()))
                     .map(dto -> dto.getStoreId()).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(storeIdList)) {
-                String[] arr = (String[]) storeIdList.toArray();
+                String[] arr = new String[storeIdList.size()] ;
+                for(int i=0;i<storeIdList.size();i++) {
+                    arr[i] = storeIdList.get(i) ;
+                }
                 List<StoreDTO> storeList = this.storeService.getStores(arr);
                 Map<String, StoreDTO> map = storeList.stream()
                         .collect(Collectors.toMap(StoreDTO::getStoreId, dto -> dto, (k1, k2) -> k1));

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanLogMapper.xml

@@ -15,6 +15,7 @@
       <result column="update_time"  property="updateTime"/>
       <result column="delete_flag" property="deleteFlag"/>
       <result column="wx_chat_id_3th" property="wxChatId3th"/>
+      <result column="staff_id" property="staffId"/>
   </resultMap>
   <sql id="Base_Column_List">
 	  log_id,
@@ -28,7 +29,7 @@
 	  send_time,
 	  delete_flag,
 	  create_time,
-	  update_time , wx_chat_id_3th 
+	  update_time , wx_chat_id_3th  , staff_id
 	  
   </sql>
   <!-- ===================== 新增 ======================== -->
@@ -46,7 +47,7 @@
 	  send_time,
 	  delete_flag,
 	  create_time,
-	  update_time , wx_chat_id_3th 
+	  update_time , wx_chat_id_3th  , staff_id 
   )VALUES(
 	  #{logId},
 	  #{planId},
@@ -59,7 +60,7 @@
 	  #{sendTime},
 	  0,
 	  now(),
-	  now() , #{wxChatId3th} 
+	  now() , #{wxChatId3th} , #{staffId}
   )
   ]]>
   </insert>
@@ -67,18 +68,18 @@
   <select id="listPlanLog"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO">
   	 SELECT	  b.clerk_id clerkId , 
               b.store_id storeId ,
-	          b.staff_id staffId ,
 	          d.name chatName , 
 	          d.total_count chatTotalCount ,
               c.staff_name staffName , 
+	          a.staff_id staffId ,
 			  a.group_chat_id groupChatId,
 			  a.send_status sendStatus,
 			  a.send_time sendTime ,
 			  a.create_time createTime 
 		  FROM tab_haoban_group_chat_plan_log a 
 		  LEFT JOIN tab_haoban_group_chat_plan_owner_log b ON a.`own_log_id` = b.`owner_log_id` 
-          LEFT JOIN tab_haoban_staff c ON b.`staff_id` = c.`staff_id` 
-          LEFT JOIN tab_haoban_group_chat d on a.group_chat_id = d.group_chat_id
+          LEFT JOIN tab_haoban_staff c      ON   a.`staff_id` = c.`staff_id` 
+          LEFT JOIN tab_haoban_group_chat d ON   a.group_chat_id = d.group_chat_id
   	  where a.wx_enterprise_id = #{wxEnterpriseId} and plan_id = #{planId}
   </select>
 </mapper> 
\ No newline at end of file

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

@@ -75,6 +75,8 @@ public class GroupChatPlanController {
 
     @RequestMapping("owner-log")
     public RestResponse<Object> ownerLog(Long planId, GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> resp = this.groupChatPlanApiService.listOwnerLogPage(planId,
                 qdto, basePageInfo);
         if (!resp.isSuccess()) {
@@ -85,6 +87,8 @@ public class GroupChatPlanController {
 
     @RequestMapping("log")
     public RestResponse<Object> log(Long planId, GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         ServiceResponse<Page<GroupChatPlanLogDTO>> resp = this.groupChatPlanApiService.listLogPage(planId, qdto,
                 basePageInfo);
         if (!resp.isSuccess()) {