|
|
|
@@ -1220,21 +1220,42 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<Object> selectListForExcelExport(Object queryParams, int page) { |
|
|
|
Map params = (Map) queryParams; |
|
|
|
WxCUserBasicInfo basicInfo = (WxCUserBasicInfo) params.get("basicInfo"); |
|
|
|
TenantEntity tenantInfo = (TenantEntity) params.get("tenantInfo"); |
|
|
|
List list = new ArrayList<WxCUserBasicInfoVo>(); |
|
|
|
basicInfo.setBegin((page-1)*10000); |
|
|
|
basicInfo.setLimit(10000); |
|
|
|
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
basicInfo.undateFinalTenantId(tenantInfo); |
|
|
|
list = wxCUserBasicInfoMapper.findVoList(basicInfo); |
|
|
|
} |
|
|
|
return list; |
|
|
|
Map params = (Map) queryParams; |
|
|
|
WxCUserBasicInfo basicInfo = (WxCUserBasicInfo) params.get("basicInfo"); |
|
|
|
TenantEntity tenantInfo = (TenantEntity) params.get("tenantInfo"); |
|
|
|
List<WxCUserBasicInfoVo> list = new ArrayList<WxCUserBasicInfoVo>(); |
|
|
|
basicInfo.setBegin((page-1)*10000); |
|
|
|
basicInfo.setLimit(10000); |
|
|
|
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ |
|
|
|
//list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo); |
|
|
|
}else{ |
|
|
|
basicInfo.undateFinalTenantId(tenantInfo); |
|
|
|
} |
|
|
|
list = wxCUserBasicInfoMapper.findVoList(basicInfo); |
|
|
|
List<Long> userIds = wxCUserBasicInfoMapper.findVoIdsList(basicInfo); |
|
|
|
if (null != userIds ) { |
|
|
|
WxCUserTags tq = new WxCUserTags(); |
|
|
|
tq.setUserIds(userIds); |
|
|
|
Map<Long,String> userTagsMap = wxCUserTagsMapper.findUserTagsMap(tq); |
|
|
|
if (null != userTagsMap) { |
|
|
|
List<WxTags> tagList = wxTagsMapper.findListAll(); |
|
|
|
Map<Long, String> tagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName)); |
|
|
|
list.stream().forEach(u->{ |
|
|
|
List<Long> ids = JSONObject.parseArray(userTagsMap.get(u.getId()), Long.class); |
|
|
|
if (null != ids) { |
|
|
|
String tagNames = StringUtils.join(ids.stream().map(id->tagMap.get(id)).collect(Collectors.toList()),"/"); |
|
|
|
u.setTagNames(tagNames); |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
if (null != list ) { |
|
|
|
List<Object> retList = new ArrayList<Object>(); |
|
|
|
retList.addAll(list); |
|
|
|
return retList; |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
|
|
|
|