saas端--租户设备管理-查看-数据分析--周报报错

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

@@ -114,7 +114,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
                 .orderByDesc(PlatElder::getId);
     }
 
-    private void fill(List<PlatElderListVO> list){
+    private void fill(List<PlatElderListVO> list) {
+
         JoinUtil.join(list, platOrgService, PlatElderListVO::getOrgId, PlatOrg::getId, (d, o) -> {
             d.setOrgName(o.getName());
         });
@@ -191,6 +192,15 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         List<PlatElder> dbList = list(lambdaQueryWrapper(dto));
 
+        dbList.forEach(e->{
+            if (StringUtils.isNotBlank(e.getHomeAddressDetail())) {
+                e.setHomeAddressDetail(e.getHomeAddress());
+            }
+            if (StringUtils.isNotBlank(e.getRegisterAddressDetail())) {
+                e.setRegisterAddressDetail(e.getRegisterAddress());
+            }
+        });
+
         List<PlatElderHealthInfo> healthInfoList = platElderHealthInfoService.list(new QueryWrapper<PlatElderHealthInfo>().lambda()
                 .in(PlatElderHealthInfo::getElderId, StreamUtil.mapId(dbList, PlatElder::getId)));
         Map<String, PlatElderHealthInfo> healthInfoMap = StreamUtil.toMap(healthInfoList, PlatElderHealthInfo::getElderId);
@@ -576,9 +586,23 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
     }
 
+    private void addressToDetail(PlatElderDTOVO dto) {
+
+        if (StringUtils.isNotBlank(dto.getHomeAddressDetail())) {
+            dto.setHomeAddressDetail(dto.getHomeAddress());
+        }
+        if (StringUtils.isNotBlank(dto.getRegisterAddressDetail())) {
+            dto.setRegisterAddressDetail(dto.getRegisterAddress());
+        }
+    }
+
+
     @Transactional
     @Override
     public void addAll(PlatElderDTOVO dto) {
+
+        addressToDetail(dto);
+
         check(BeanDtoVoUtils.convert(dto, PlatElderAddDTO.class));
 
         PlatElder platElder = BeanDtoVoUtils.convert(dto, PlatElder.class);
@@ -665,6 +689,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
     @Transactional
     public void edit(PlatElderDTOVO dto) {
 
+        addressToDetail(dto);
+
         check(BeanDtoVoUtils.convert(dto, PlatElderAddDTO.class));
 
         PlatElder db = getById(dto.getId());
@@ -700,6 +726,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         PlatElder platElder = getById(id);
         PlatElderDTOVO vo = BeanDtoVoUtils.convert(platElder, PlatElderDTOVO.class);
 
+        addressToDetail(vo);
+
         FileUtil.convert(Arrays.asList(vo), PlatElderDTOVO::getAvatar, (e, f) -> {
             e.setAvatar(f.getFullUrl());
         });