fix：子女端长者信息

server-service/src/main/java/com/makeit/service/platform/elder/PlatElderService.java

@@ -31,6 +31,7 @@ public interface PlatElderService extends IService<PlatElder> {
 
 
     List<PlatElderListVO> list(PlatElderQueryDTO dto);
     List<PlatElderListVO> list(PlatElderQueryDTO dto);
 
 
+    void fill(List<PlatElderListVO> list);
     void exportExcel(HttpServletResponse response, PlatElderQueryDTO dto);
     void exportExcel(HttpServletResponse response, PlatElderQueryDTO dto);
 
 
     void exportTemplate(HttpServletResponse response);
     void exportTemplate(HttpServletResponse response);
@@ -64,6 +65,8 @@ public interface PlatElderService extends IService<PlatElder> {
     /*小程序*/
     /*小程序*/
     List<PlatElderWechatSimpleVO> listMy();
     List<PlatElderWechatSimpleVO> listMy();
 
 
+
+
     void batchEdit(PlatElderBatchEditDTOVO dto);
     void batchEdit(PlatElderBatchEditDTOVO dto);
 
 
     List<PlatElderListVO> listByElder(PlatElderQueryDTO dto);
     List<PlatElderListVO> listByElder(PlatElderQueryDTO dto);

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
+import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
 import com.makeit.common.page.PageVO;
@@ -32,6 +33,7 @@ import com.makeit.utils.user.common.CommonUserUtil;
 import com.makeit.utils.user.common.CommonUserVO;
 import com.makeit.utils.user.common.CommonUserVO;
 import com.makeit.utils.user.wechat.WechatUserUtil;
 import com.makeit.utils.user.wechat.WechatUserUtil;
 import com.makeit.vo.platform.elder.PlatElderChildrenInfoListVO;
 import com.makeit.vo.platform.elder.PlatElderChildrenInfoListVO;
+import com.makeit.vo.platform.elder.PlatElderListVO;
 import com.makeit.vo.wechat.elder.PlatElderChildrenInfoWechatVO;
 import com.makeit.vo.wechat.elder.PlatElderChildrenInfoWechatVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
@@ -223,11 +225,15 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
         }
         }
 
 
         List<String> elderIdList = StreamUtil.map(platElderChildrenInfoList, PlatElderChildrenInfo::getElderId);
         List<String> elderIdList = StreamUtil.map(platElderChildrenInfoList, PlatElderChildrenInfo::getElderId);
-        Map<String, PlatElder> elderMap = StreamUtil.toMapDep(platElderService.listByIds(elderIdList), BaseEntity::getId);
+        List<PlatElder> platElders = platElderService.listByIds(elderIdList);
+        List<PlatElderListVO> list = BeanDtoVoUtils.listVo(platElders, PlatElderListVO.class);
+
+        platElderService.fill(list);
+        Map<String, PlatElderListVO> elderListVOMap = StreamUtil.toMapDep(list, BaseIdDTO::getId);
         List<PlatElderChildrenInfoWechatVO> voList = Lists.newArrayList();
         List<PlatElderChildrenInfoWechatVO> voList = Lists.newArrayList();
         for (PlatElderChildrenInfo platElderChildrenInfo : platElderChildrenInfoList) {
         for (PlatElderChildrenInfo platElderChildrenInfo : platElderChildrenInfoList) {
             PlatElderChildrenInfoWechatVO vo = BeanDtoVoUtils.convert(platElderChildrenInfo, PlatElderChildrenInfoWechatVO.class);
             PlatElderChildrenInfoWechatVO vo = BeanDtoVoUtils.convert(platElderChildrenInfo, PlatElderChildrenInfoWechatVO.class);
-            vo.setPlatElder(elderMap.getOrDefault(platElderChildrenInfo.getElderId(),new PlatElder()));
+            vo.setPlatElder(elderListVOMap.getOrDefault(platElderChildrenInfo.getElderId(),new PlatElderListVO()));
             voList.add(vo);
             voList.add(vo);
         }
         }
 
 

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -156,7 +156,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
                 .orderByDesc(PlatElder::getId);
                 .orderByDesc(PlatElder::getId);
     }
     }
 
 
-    private void fill(List<PlatElderListVO> list) {
+    @Override
+    public void fill(List<PlatElderListVO> list) {
 
 
         JoinUtil.join(list, platOrgService, PlatElderListVO::getOrgId, PlatOrg::getId, (d, o) -> {
         JoinUtil.join(list, platOrgService, PlatElderListVO::getOrgId, PlatOrg::getId, (d, o) -> {
             d.setOrgName(o.getName());
             d.setOrgName(o.getName());

server-service/src/main/java/com/makeit/vo/wechat/elder/PlatElderChildrenInfoWechatVO.java

 package com.makeit.vo.wechat.elder;
 package com.makeit.vo.wechat.elder;
 
 
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.dto.BaseIdDTO;
-import com.makeit.common.dto.BaseTenantDTO;
-import com.makeit.entity.platform.elder.PlatElder;
+import com.makeit.vo.platform.elder.PlatElderListVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -24,7 +23,7 @@ public class PlatElderChildrenInfoWechatVO extends BaseIdDTO {
     @ApiModelProperty(value = "长者id")
     @ApiModelProperty(value = "长者id")
     private String elderId;
     private String elderId;
     @ApiModelProperty(value = "长者信息")
     @ApiModelProperty(value = "长者信息")
-    private PlatElder platElder;
+    private PlatElderListVO platElder;
 
 
     @ApiModelProperty(value = "姓名")
     @ApiModelProperty(value = "姓名")
     private String name;
     private String name;