Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !815

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

@@ -247,10 +247,6 @@ public class GroupChatServiceImpl implements GroupChatService {
     public Page<GroupChatDTO> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
         List<TabGroupChatHmRelation> relationList = null;
         if (null != qdto.getChatHmId()) {
-            /*if (qdto.getIncludeOff() == 1) {
-                relationList = this.groupChatHmRelationMapper.listByChatHmIdIncludeOff(qdto.getChatHmId());
-            } else {
-            }*/
             relationList = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId());
             if (CollectionUtils.isEmpty(relationList)) {
                 return new Page<GroupChatDTO>();
@@ -267,15 +263,6 @@ public class GroupChatServiceImpl implements GroupChatService {
             qdto.setSearchParams("%" + params + "%");
         }
         List<GroupChatDTO> list = this.groupChatMapper.list(qdto);
-        if(CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(relationList)) {
-            Map<Long,Date> offMap = relationList.stream().filter(dto->dto.getStatusFlag()==2).collect(Collectors.toMap(TabGroupChatHmRelation::getGroupChatId,TabGroupChatHmRelation::getUpdateTime,(k1,k2)->k1));
-            for(GroupChatDTO dto : list) {
-                if(null != offMap.get(dto.getGroupChatId())) {
-                    dto.setOffTime( offMap.get(dto.getGroupChatId()));
-                    dto.setHmAddStatus(2);
-                }
-            }
-        }
         Page<GroupChatDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatDTO.class);
         return retPage;
     }
@@ -639,6 +626,9 @@ public class GroupChatServiceImpl implements GroupChatService {
         this.saveOwnerHistory(wxEnterpriseId, groupChatId, newStaffId, oldStaffId);
         chat.setOriginalStaffId(oldStaffId);
         this.groupChatMapper.update(chat);
+        if(StringUtils.isBlank(chat.getWxChatIdDk())) {
+            this.updateWxChatIdDk(wxEnterpriseId, staff.getStaffId()) ;
+        }
         this.saveOwner(wxEnterpriseId, staff.getStaffId());
         if (!syncMember) {
             logger.info("不同步群成员");

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

@@ -57,7 +57,7 @@ public class GroupChatPlanController {
         qdto.setEnterpriseId(enterpriseId);
         qdto.setClerkId(clerkId);
         if (StringUtils.isNotBlank(searchParams)) {
-            qdto.setSearchParams("%"+searchParams+"%");
+            qdto.setSearchParams("%" + searchParams + "%");
         }
         ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService
                 .listOwnerLogPageForWxaTotal(qdto, basePageInfo);
@@ -92,7 +92,7 @@ public class GroupChatPlanController {
     }
 
     @RequestMapping("detail")
-    public RestResponse<Object> detail(Long planId, String clerkId, String staffId, String wxEnterpriseId) {
+    public RestResponse<Object> detail(Long planId, String wxEnterpriseId, Long ownerLogId) {
         if (null == planId) {
             return RestResponse.failure("1", "planid为空");
         }
@@ -113,9 +113,8 @@ public class GroupChatPlanController {
         Map<String, Object> retMap = new HashMap<>();
         retMap.put("plan", plan);
         retMap.put("materialList", materials);
-        if (StringUtils.isNotEmpty(clerkId)) {
-            ServiceResponse<GroupChatPlanOwnerLogDTO> resp = this.groupChatPlanApiService.getOwnerInfo(planId, staffId,
-                    clerkId, wxEnterpriseId);
+        if (null != ownerLogId) {
+            ServiceResponse<GroupChatPlanOwnerLogDTO> resp = this.groupChatPlanApiService.getOwnerSendInfo(ownerLogId);
             GroupChatPlanOwnerLogDTO owner = resp.getResult();
             if (!resp.isSuccess() || null == owner) {
                 return RestResponse.failure("1", "记录不存在");
@@ -130,15 +129,14 @@ public class GroupChatPlanController {
     }
 
     @RequestMapping("owner-do-list")
-    public RestResponse<Object> ownerDoList(Long planId, String clerkId, String wxEnterpriseId, String enterpriseId,
-            String staffId, Long ownLogId, BasePageInfo basePageInfo) {
-        if (null == planId || StringUtils.isEmpty(clerkId)) {
+    public RestResponse<Object> ownerDoList(Long planId, String wxEnterpriseId, String enterpriseId, Long ownLogId,
+            BasePageInfo basePageInfo) {
+        if (null == planId || null == ownLogId) {
             return RestResponse.failure("1", "参数未传");
         }
         GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);
-        qdto.setClerkId(clerkId);
         qdto.setPlanId(planId);
         qdto.setOwnLogId(ownLogId);
         ServiceResponse<Page<GroupChatPlanLogDTO>> page = this.groupChatPlanApiService.listLogPage(planId, qdto,