Commit af5d861b by huangjy

fix:长者信息

parent 4f99ac8f
......@@ -255,7 +255,8 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
@Override
public List<PlatElderChildrenInfoWechatVO> listByOpenid(String openid) {
List<PlatElderChildrenInfo> platElderChildrenInfoList = list(new QueryWrapper<PlatElderChildrenInfo>().lambda().eq(PlatElderChildrenInfo::getOpenid, openid)
List<PlatElderChildrenInfo> platElderChildrenInfoList = list(new QueryWrapper<PlatElderChildrenInfo>().lambda()
.eq(PlatElderChildrenInfo::getOpenid, openid)
.isNotNull(PlatElderChildrenInfo::getElderId));
if (CollectionUtils.isEmpty(platElderChildrenInfoList)) {
......@@ -264,14 +265,21 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
List<String> elderIdList = StreamUtil.map(platElderChildrenInfoList, PlatElderChildrenInfo::getElderId);
List<PlatElder> platElders = platElderService.listByIds(elderIdList);
if (CollectionUtils.isEmpty(platElders)) {
return Lists.newArrayList();
}
List<PlatElderListVO> list = BeanDtoVoUtils.listVo(platElders, PlatElderListVO.class);
platElderService.fill(list);
Map<String, PlatElderListVO> elderListVOMap = StreamUtil.toMapDep(list, BaseIdDTO::getId);
Map<String, PlatElderListVO> elderListVOMap = StreamUtil.toMap(list, BaseIdDTO::getId);
List<PlatElderChildrenInfoWechatVO> voList = Lists.newArrayList();
for (PlatElderChildrenInfo platElderChildrenInfo : platElderChildrenInfoList) {
PlatElderChildrenInfoWechatVO vo = BeanDtoVoUtils.convert(platElderChildrenInfo, PlatElderChildrenInfoWechatVO.class);
vo.setPlatElder(elderListVOMap.getOrDefault(platElderChildrenInfo.getElderId(),new PlatElderListVO()));
PlatElderListVO platElderListVO = elderListVOMap.get(platElderChildrenInfo.getElderId());
if (platElderListVO == null) {
continue;
}
vo.setPlatElder(platElderListVO);
voList.add(vo);
}
......
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 sign in to comment