创建人权限

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/ChatHmSearchQDTO.java

@@ -17,6 +17,15 @@ public class ChatHmSearchQDTO implements Serializable {
     private Integer status ;
     private Long linkId;
     private List<Long> chatHmIdList;
+    private List<String> creatorIdList ;
+
+    public List<String> getCreatorIdList() {
+        return creatorIdList;
+    }
+
+    public void setCreatorIdList(List<String> creatorIdList) {
+        this.creatorIdList = creatorIdList;
+    }
 
     public List<Long> getChatHmIdList() {
         return chatHmIdList;

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatPlanSearchQDTO.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.dto.qdto.chat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 public class GroupChatPlanSearchQDTO implements Serializable {
 
@@ -24,7 +25,16 @@ public class GroupChatPlanSearchQDTO implements Serializable {
     private String clerkId ;
     private String storeId ;
     private Long ownLogId ;
+    private List<String> creatorIdList ;
     
+    public List<String> getCreatorIdList() {
+        return creatorIdList;
+    }
+
+    public void setCreatorIdList(List<String> creatorIdList) {
+        this.creatorIdList = creatorIdList;
+    }
+
     public Long getOwnLogId() {
         return ownLogId;
     }

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

@@ -114,7 +114,13 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
             if (entity.getSendType() == 1) {
                 entity.setSendTime(new Date());
             }
+            entity.setStatusFlag(1);
+            entity.setStaffCount(dto.getStaffIdList().split(",").length);
+            entity.setSendCount(0);
+            entity.setSuccessChatCount(0);
+            entity.setTotalChatCount(0);
             this.groupChatPlanMapper.insert(entity);
+            // 新增群主日志
             this.groupChatPlanOwnerLogService.batchAdd(dto.getStaffIdList(), entity);
             // 立即发送
             if (entity.getSendType() == 1) {
@@ -124,12 +130,14 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
             }
         } else {
             this.groupChatPlanMapper.updateById(entity);
+            // 删除本次删除的
             if (StringUtils.isNotBlank(dto.getDelStaffIdList())) {
                 String arr = dto.getDelStaffIdList();
                 List<String> delStaffIdList = Arrays.asList(arr);
                 this.groupChatPlanOwnerLogService.deleteByStaffIds(planId, delStaffIdList);
             }
-            if (StringUtils.isNoneBlank(dto.getStaffIdList())) {
+            // 新增本次新增的
+            if (StringUtils.isNotBlank(dto.getStaffIdList())) {
                 String staffIdList = dto.getStaffIdList();
                 this.groupChatPlanOwnerLogService.batchAdd(staffIdList, entity);
             }

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

@@ -158,6 +158,12 @@
 				#{id}
 			</foreach>
 		</if>
+		<if test="null != creatorIdList and creatorIdList.size > 0">
+			and creator_id in 
+			<foreach collection="creatorIdList" close=")" index="index" item="id" open="(" separator=",">
+				#{id}
+			</foreach>
+		</if>
 	</select>
 
 </mapper> 
\ No newline at end of file

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

@@ -164,11 +164,17 @@
 		<if test="null != status and status==3">
 			and end_time  <![CDATA[<]]> 	now()
 		</if>
-		<if test="null != searchParams">
+		<if test="null != searchParams and '' != searchParams ">
 			and name like '%${searchParams}%'
 		</if>
 		<if test="null != startDate">
 			and create_time <![CDATA[>=]]>	#{startDate} and create_time <![CDATA[<=]]> #{endDate}
 		</if>
+		<if test="null !=creatorIdList and creatorIdList.size>0">
+			 and creator_id in 
+			 <foreach collection="creatorIdList" item="id" close=")" index="index" open="(" separator=",">
+			 	#{id}
+			 </foreach>
+		</if>
 	</select>
 </mapper> 
\ No newline at end of file

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

@@ -10,6 +10,7 @@ import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -43,6 +44,7 @@ import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkChatQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
 import com.gic.haoban.manage.api.service.chat.GroupChatHmApiService;
+import com.gic.haoban.manage.web.utils.CreatorUtils;
 import com.gic.haoban.manage.web.vo.chat.HmLinkChatListVO;
 import com.gic.qcloud.BucketNameEnum;
 import com.gic.qcloud.FileUploadUtil;
@@ -98,6 +100,10 @@ public class GroupChatHmController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        List<String> creatorIdList = CreatorUtils.getCreatorIdList(0) ;
+        if(CollectionUtils.isNotEmpty(creatorIdList)) {
+            qdto.setCreatorIdList(creatorIdList) ;
+        }
         ServiceResponse<Page<GroupChatHmDTO>> page = this.groupChatHmApiService.listPage(qdto, basePageInfo);
         return RestResponse.successResult(page.getResult());
     }

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

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,6 +30,7 @@ import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 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.GroupChatPlanVO;
 
 /**
@@ -42,15 +44,15 @@ import com.gic.haoban.manage.web.vo.chat.GroupChatPlanVO;
 @RestController
 @RequestMapping("/chat/plan")
 public class GroupChatPlanController {
-    
+
     private static org.apache.logging.log4j.Logger logger = LogManager.getLogger(GroupChatPlanController.class);
-    
+
     @Autowired
     private GroupChatPlanApiService groupChatPlanApiService;
     @Autowired
-    private MaterialApiService materialApiService ;
+    private MaterialApiService materialApiService;
     @Autowired
-    private StaffApiService staffApiService ;
+    private StaffApiService staffApiService;
 
     @RequestMapping("add")
     public RestResponse<Object> save(@RequestBody GroupChatPlanDTO dto) {
@@ -100,6 +102,10 @@ public class GroupChatPlanController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        List<String> creatorIdList = CreatorUtils.getCreatorIdList(0);
+        if (CollectionUtils.isNotEmpty(creatorIdList)) {
+            qdto.setCreatorIdList(creatorIdList);
+        }
         ServiceResponse<Page<GroupChatPlanDTO>> page = this.groupChatPlanApiService.listPage(qdto, basePageInfo);
         return RestResponse.successResult(page.getResult());
     }
@@ -111,7 +117,7 @@ public class GroupChatPlanController {
             return RestResponse.failure("1", "计划不存在");
         }
         GroupChatPlanDTO plan = linkResp.getResult();
-        plan.getStaffIdList() ;
+        plan.getStaffIdList();
         String content = plan.getChatContent();
         JSONArray array = JSONArray.parseArray(content);
         List<String> materialIdList = new ArrayList<>();
@@ -121,10 +127,10 @@ 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) ;
-        GroupChatPlanVO vo = EntityUtil.changeEntityByJSON(GroupChatPlanVO.class,plan) ;
+        String[] jsonArr = plan.getStaffIdList().split(",");
+        List<String> staffIds = Arrays.asList(jsonArr);
+        List<StaffDTO> staffList = this.staffApiService.listByIds(staffIds);
+        GroupChatPlanVO vo = EntityUtil.changeEntityByJSON(GroupChatPlanVO.class, plan);
         vo.setMaterialIdList(materials);
         vo.setOwnerList(staffList);
         return RestResponse.successResult(vo);