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

计划名称

See merge request !810

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

@@ -11,7 +11,7 @@ public interface GroupChatPlanService {
 
     public void save(GroupChatPlanDTO dto);
 
-    GroupChatPlanBO getById(Long hmId);
+    GroupChatPlanBO getById(Long planId);
 
     public Page<GroupChatPlanBO> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo);
 

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

@@ -7,6 +7,8 @@ import org.springframework.stereotype.Service;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
@@ -28,6 +30,8 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
     private GroupChatPlanService groupChatPlanService;
     @Autowired
     private GroupChatPlanOwnerLogService groupChatPlanOwnerLogService;
+    @Autowired
+    private ClerkService clerkService ;
 
     @Override
     public ServiceResponse<Page<GroupChatPlanDTO>> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
@@ -98,6 +102,13 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
     public ServiceResponse<GroupChatPlanOwnerLogDTO> getOwnerSendInfo(Long ownerLogId) {
         TabGroupChatPlanOwnerLog log = this.groupChatPlanOwnerLogService.getById(ownerLogId);
         GroupChatPlanOwnerLogDTO dto = EntityUtil.changeEntityByJSON(GroupChatPlanOwnerLogDTO.class, log);
+        if(null != dto && StringUtils.isNotBlank(dto.getClerkId())) {
+            ClerkDTO clerk =  this.clerkService.getclerkById(dto.getClerkId());
+            dto.setClerkName(clerk.getClerkName());
+         }
+        Long planId = log.getPlanId() ;
+        GroupChatPlanBO plan = this.groupChatPlanService.getById(planId) ;
+        dto.setPlanName(plan.getName());
         return ServiceResponse.success(dto);
     }