Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

创建房屋时，导入人口数据 --renpc

Browse Source
This commit is contained in:
Renpc-kilig 2023-11-16 15:00:06 +08:00
parent e3ca87dc6d
commit bf94049c6d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/cm/population/pojo/dtos/house/HouseDTO.java
View File

@ -1,6 +1,6 @@
package com.cm.population.pojo.dtos.house; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -128,7 +128,7 @@ public class HouseDTO {
@ApiModelProperty(name = "houseType", value = "房屋类型") @ApiModelProperty(name = "houseType", value = "房屋类型")
private String houseType; private String houseType;
@ApiModelProperty(name = "populationVOList", value = "同住人信息") @ApiModelProperty(name = "populationVOList", value = "同住人信息")
private List<PopulationVO> populationVOList; private List<PopulationDTO> populationDTOList;
public String getHouseId() { public String getHouseId() {
return houseId; return houseId;
@ -570,11 +570,11 @@ public class HouseDTO {
this.houseType = houseType; this.houseType = houseType;
} }
public List<PopulationVO> getPopulationVOList() { public List<PopulationDTO> getPopulationDTOList() {
return populationVOList; return populationDTOList;
} }
public void setPopulationVOList(List<PopulationVO> populationVOList) { public void setPopulationDTOList(List<PopulationDTO> populationDTOList) {
this.populationVOList = populationVOList; this.populationDTOList = populationDTOList;
} }
} }

5
src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
View File

@ -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.AutoHouseDTO;
import com.cm.population.pojo.dtos.house.BatchHouseDTO; import com.cm.population.pojo.dtos.house.BatchHouseDTO;
import com.cm.population.pojo.dtos.house.HouseDTO; 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.dtos.residential.ResidentialDTO;
import com.cm.population.pojo.pos.house.HousePO; import com.cm.population.pojo.pos.house.HousePO;
import com.cm.population.pojo.vos.building.BuildingBatchVO; import com.cm.population.pojo.vos.building.BuildingBatchVO;
@ -172,6 +173,10 @@ public class HouseServiceImpl extends AbstractService implements IHouseService {
houseDTO.setUnitNum(buildingDTO.getUnitNum()); houseDTO.setUnitNum(buildingDTO.getUnitNum());
houseDTO.setFloorsNum(buildingDTO.getFloorsNum()); houseDTO.setFloorsNum(buildingDTO.getFloorsNum());
} }
params.put("houseId", houseDTO.getHouseId());
List<PopulationDTO> list = populationService.list(params);
houseDTO.setPopulationDTOList(list);
} }
return houseDTO; return houseDTO;
} }