Commit d9c022a1 by 朱亚洁

feat:[1005043]加群分类

parent 45528dce
...@@ -90,4 +90,10 @@ public class GroupActivity4AppletDTO implements Serializable { ...@@ -90,4 +90,10 @@ public class GroupActivity4AppletDTO implements Serializable {
@ApiModelProperty("描述") @ApiModelProperty("描述")
private String groupDesc; private String groupDesc;
@ApiModelProperty("群分类")
private Long firstClassify;
@ApiModelProperty("群分类")
private String firstClassifyName;
} }
...@@ -70,4 +70,8 @@ public class BookQrcodeWxworkResponseVO extends BaseDto { ...@@ -70,4 +70,8 @@ public class BookQrcodeWxworkResponseVO extends BaseDto {
*/ */
private String url; private String url;
/**
* 群分类
*/
private String classifyName;
} }
...@@ -786,6 +786,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz { ...@@ -786,6 +786,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
responseVO.setGroupName(wxworkGroupQrcodeBaseDTO.getGroupQrcodeName()); responseVO.setGroupName(wxworkGroupQrcodeBaseDTO.getGroupQrcodeName());
responseVO.setGroupDesc(wxworkGroupQrcodeBaseDTO.getInvitationRays()); responseVO.setGroupDesc(wxworkGroupQrcodeBaseDTO.getInvitationRays());
responseVO.setUrl(wxworkGroupQrcodeBaseDTO.getUrl()); responseVO.setUrl(wxworkGroupQrcodeBaseDTO.getUrl());
responseVO.setClassifyName(wxworkGroupQrcodeBaseDTO.getClassifyName());
//头像列表从缓存里取 //头像列表从缓存里取
List<String> headUrlList = appletGroupSearchRecordBiz.getHeadUrlList(9, itemVO.getServeId()); List<String> headUrlList = appletGroupSearchRecordBiz.getHeadUrlList(9, itemVO.getServeId());
responseVO.setHeadUrlList(headUrlList); responseVO.setHeadUrlList(headUrlList);
......
...@@ -834,10 +834,15 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz { ...@@ -834,10 +834,15 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
if (!ListUtils.isEmpty(activityGroupIds)) { if (!ListUtils.isEmpty(activityGroupIds)) {
localMap = pcloudGroupActivityDao.getByIds(activityGroupIds, 1); localMap = pcloudGroupActivityDao.getByIds(activityGroupIds, 1);
} }
List<Long> firstClassifys = localMap.values().stream().filter(s->s.getFirstClassify()>0).map(GroupActivity4AppletDTO::getFirstClassify).distinct().collect(Collectors.toList());
Map<Long, AssistTempletDTO> classifyMap = assistTempletConsr.mapByIds4Classify(firstClassifys);
for(GroupActivity4AppletDTO groupActivity4AppletDTO: localMap.values()){ for(GroupActivity4AppletDTO groupActivity4AppletDTO: localMap.values()){
String filterStr = StringUtilParent.replaceHtml(groupActivity4AppletDTO.getDesc()); String filterStr = StringUtilParent.replaceHtml(groupActivity4AppletDTO.getDesc());
String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr; String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
groupActivity4AppletDTO.setCutDesc(subStr); groupActivity4AppletDTO.setCutDesc(subStr);
if (!MapUtils.isEmpty(classifyMap) && classifyMap.containsKey(groupActivity4AppletDTO.getFirstClassify())){
groupActivity4AppletDTO.setFirstClassifyName(classifyMap.get(groupActivity4AppletDTO.getFirstClassify()).getTempletName());
}
} }
return localMap; return localMap;
} }
......
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