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 populationVOList; + private List populationDTOList; public String getHouseId() { return houseId; @@ -570,11 +570,11 @@ public class HouseDTO { this.houseType = houseType; } - public List getPopulationVOList() { - return populationVOList; + public List getPopulationDTOList() { + return populationDTOList; } - public void setPopulationVOList(List populationVOList) { - this.populationVOList = populationVOList; + public void setPopulationDTOList(List 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 list = populationService.list(params); + houseDTO.setPopulationDTOList(list); } return houseDTO; }