Commit 3d7c9bc5 by 徐高华

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

Feature/社群

See merge request !815
parents 9e103e3c 59c4f1a8
...@@ -247,10 +247,6 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -247,10 +247,6 @@ public class GroupChatServiceImpl implements GroupChatService {
public Page<GroupChatDTO> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) { public Page<GroupChatDTO> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
List<TabGroupChatHmRelation> relationList = null; List<TabGroupChatHmRelation> relationList = null;
if (null != qdto.getChatHmId()) { if (null != qdto.getChatHmId()) {
/*if (qdto.getIncludeOff() == 1) {
relationList = this.groupChatHmRelationMapper.listByChatHmIdIncludeOff(qdto.getChatHmId());
} else {
}*/
relationList = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId()); relationList = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId());
if (CollectionUtils.isEmpty(relationList)) { if (CollectionUtils.isEmpty(relationList)) {
return new Page<GroupChatDTO>(); return new Page<GroupChatDTO>();
...@@ -267,15 +263,6 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -267,15 +263,6 @@ public class GroupChatServiceImpl implements GroupChatService {
qdto.setSearchParams("%" + params + "%"); qdto.setSearchParams("%" + params + "%");
} }
List<GroupChatDTO> list = this.groupChatMapper.list(qdto); 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); Page<GroupChatDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatDTO.class);
return retPage; return retPage;
} }
...@@ -639,6 +626,9 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -639,6 +626,9 @@ public class GroupChatServiceImpl implements GroupChatService {
this.saveOwnerHistory(wxEnterpriseId, groupChatId, newStaffId, oldStaffId); this.saveOwnerHistory(wxEnterpriseId, groupChatId, newStaffId, oldStaffId);
chat.setOriginalStaffId(oldStaffId); chat.setOriginalStaffId(oldStaffId);
this.groupChatMapper.update(chat); this.groupChatMapper.update(chat);
if(StringUtils.isBlank(chat.getWxChatIdDk())) {
this.updateWxChatIdDk(wxEnterpriseId, staff.getStaffId()) ;
}
this.saveOwner(wxEnterpriseId, staff.getStaffId()); this.saveOwner(wxEnterpriseId, staff.getStaffId());
if (!syncMember) { if (!syncMember) {
logger.info("不同步群成员"); logger.info("不同步群成员");
......
...@@ -57,7 +57,7 @@ public class GroupChatPlanController { ...@@ -57,7 +57,7 @@ public class GroupChatPlanController {
qdto.setEnterpriseId(enterpriseId); qdto.setEnterpriseId(enterpriseId);
qdto.setClerkId(clerkId); qdto.setClerkId(clerkId);
if (StringUtils.isNotBlank(searchParams)) { if (StringUtils.isNotBlank(searchParams)) {
qdto.setSearchParams("%"+searchParams+"%"); qdto.setSearchParams("%" + searchParams + "%");
} }
ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService
.listOwnerLogPageForWxaTotal(qdto, basePageInfo); .listOwnerLogPageForWxaTotal(qdto, basePageInfo);
...@@ -92,7 +92,7 @@ public class GroupChatPlanController { ...@@ -92,7 +92,7 @@ public class GroupChatPlanController {
} }
@RequestMapping("detail") @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) { if (null == planId) {
return RestResponse.failure("1", "planid为空"); return RestResponse.failure("1", "planid为空");
} }
...@@ -113,9 +113,8 @@ public class GroupChatPlanController { ...@@ -113,9 +113,8 @@ public class GroupChatPlanController {
Map<String, Object> retMap = new HashMap<>(); Map<String, Object> retMap = new HashMap<>();
retMap.put("plan", plan); retMap.put("plan", plan);
retMap.put("materialList", materials); retMap.put("materialList", materials);
if (StringUtils.isNotEmpty(clerkId)) { if (null != ownerLogId) {
ServiceResponse<GroupChatPlanOwnerLogDTO> resp = this.groupChatPlanApiService.getOwnerInfo(planId, staffId, ServiceResponse<GroupChatPlanOwnerLogDTO> resp = this.groupChatPlanApiService.getOwnerSendInfo(ownerLogId);
clerkId, wxEnterpriseId);
GroupChatPlanOwnerLogDTO owner = resp.getResult(); GroupChatPlanOwnerLogDTO owner = resp.getResult();
if (!resp.isSuccess() || null == owner) { if (!resp.isSuccess() || null == owner) {
return RestResponse.failure("1", "记录不存在"); return RestResponse.failure("1", "记录不存在");
...@@ -130,15 +129,14 @@ public class GroupChatPlanController { ...@@ -130,15 +129,14 @@ public class GroupChatPlanController {
} }
@RequestMapping("owner-do-list") @RequestMapping("owner-do-list")
public RestResponse<Object> ownerDoList(Long planId, String clerkId, String wxEnterpriseId, String enterpriseId, public RestResponse<Object> ownerDoList(Long planId, String wxEnterpriseId, String enterpriseId, Long ownLogId,
String staffId, Long ownLogId, BasePageInfo basePageInfo) { BasePageInfo basePageInfo) {
if (null == planId || StringUtils.isEmpty(clerkId)) { if (null == planId || null == ownLogId) {
return RestResponse.failure("1", "参数未传"); return RestResponse.failure("1", "参数未传");
} }
GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO(); GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();
qdto.setWxEnterpriseId(wxEnterpriseId); qdto.setWxEnterpriseId(wxEnterpriseId);
qdto.setEnterpriseId(enterpriseId); qdto.setEnterpriseId(enterpriseId);
qdto.setClerkId(clerkId);
qdto.setPlanId(planId); qdto.setPlanId(planId);
qdto.setOwnLogId(ownLogId); qdto.setOwnLogId(ownLogId);
ServiceResponse<Page<GroupChatPlanLogDTO>> page = this.groupChatPlanApiService.listLogPage(planId, qdto, ServiceResponse<Page<GroupChatPlanLogDTO>> page = this.groupChatPlanApiService.listLogPage(planId, qdto,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment