From bf94049c6dce2eeac47bf88d78ebf41a52dcfde5 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Thu, 16 Nov 2023 15:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=88=BF=E5=B1=8B=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E4=BA=BA=E5=8F=A3=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=20=20--renpc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cm/population/pojo/dtos/house/HouseDTO.java  | 12 ++++++------
 .../service/house/impl/HouseServiceImpl.java         |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/cm/population/pojo/dtos/house/HouseDTO.java b/src/main/java/com/cm/population/pojo/dtos/house/HouseDTO.java
index e84fa92..f1fce42 100644
--- a/src/main/java/com/cm/population/pojo/dtos/house/HouseDTO.java
+++ b/src/main/java/com/cm/population/pojo/dtos/house/HouseDTO.java
@@ -1,6 +1,6 @@
 package com.cm.population.pojo.dtos.house;
 
-import com.cm.population.pojo.vos.population.PopulationVO;
+import com.cm.population.pojo.dtos.population.PopulationDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -128,7 +128,7 @@ public class HouseDTO {
     @ApiModelProperty(name = "houseType", value = "房屋类型")
     private String houseType;
     @ApiModelProperty(name = "populationVOList", value = "同住人信息")
-    private List<PopulationVO> populationVOList;
+    private List<PopulationDTO> populationDTOList;
 
     public String getHouseId() {
         return houseId;
@@ -570,11 +570,11 @@ public class HouseDTO {
         this.houseType = houseType;
     }
 
-    public List<PopulationVO> getPopulationVOList() {
-        return populationVOList;
+    public List<PopulationDTO> getPopulationDTOList() {
+        return populationDTOList;
     }
 
-    public void setPopulationVOList(List<PopulationVO> populationVOList) {
-        this.populationVOList = populationVOList;
+    public void setPopulationDTOList(List<PopulationDTO> populationDTOList) {
+        this.populationDTOList = populationDTOList;
     }
 }
diff --git a/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java b/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
index 1b3425d..20ffeff 100644
--- a/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
+++ b/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
@@ -13,6 +13,7 @@ import com.cm.population.pojo.dtos.building.BuildingDTO;
 import com.cm.population.pojo.dtos.house.AutoHouseDTO;
 import com.cm.population.pojo.dtos.house.BatchHouseDTO;
 import com.cm.population.pojo.dtos.house.HouseDTO;
+import com.cm.population.pojo.dtos.population.PopulationDTO;
 import com.cm.population.pojo.dtos.residential.ResidentialDTO;
 import com.cm.population.pojo.pos.house.HousePO;
 import com.cm.population.pojo.vos.building.BuildingBatchVO;
@@ -172,6 +173,10 @@ public class HouseServiceImpl extends AbstractService implements IHouseService {
                 houseDTO.setUnitNum(buildingDTO.getUnitNum());
                 houseDTO.setFloorsNum(buildingDTO.getFloorsNum());
             }
+
+            params.put("houseId", houseDTO.getHouseId());
+            List<PopulationDTO> list = populationService.list(params);
+            houseDTO.setPopulationDTOList(list);
         }
         return houseDTO;
     }