绑定房屋人口bug修改 --renpc
This commit is contained in:
parent
8b17c84314
commit
451f13aff7
@ -83,10 +83,12 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
|
|||||||
params.put("outHouse", 0);
|
params.put("outHouse", 0);
|
||||||
|
|
||||||
// 解除脱敏
|
// 解除脱敏
|
||||||
PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationVO.getPopulationInfoId());
|
if(null != params.get("populationInfoId") && StringUtils.isNotEmpty(params.get("populationInfoId").toString())) {
|
||||||
params.put("name", populationInfoDTO.getName());
|
PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationVO.getPopulationInfoId());
|
||||||
params.put("cardNum", populationInfoDTO.getIdcard());
|
params.put("name", populationInfoDTO.getName());
|
||||||
params.put("phone", populationInfoDTO.getPhone());
|
params.put("cardNum", populationInfoDTO.getIdcard());
|
||||||
|
params.put("phone", populationInfoDTO.getPhone());
|
||||||
|
}
|
||||||
|
|
||||||
populationDao.save(params);
|
populationDao.save(params);
|
||||||
return populationId;
|
return populationId;
|
||||||
@ -184,7 +186,16 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
|
|||||||
public List<PopulationDTO> list(Map<String, Object> params) {
|
public List<PopulationDTO> list(Map<String, Object> params) {
|
||||||
List<PopulationDTO> list = populationDao.list(params);
|
List<PopulationDTO> list = populationDao.list(params);
|
||||||
for (PopulationDTO populationDTO : list) {
|
for (PopulationDTO populationDTO : list) {
|
||||||
PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
|
PopulationInfoDTO populationInfoDTO = new PopulationInfoDTO();
|
||||||
|
if(StringUtils.isNotEmpty(populationDTO.getPopulationInfoId())) {
|
||||||
|
populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
|
||||||
|
}else {
|
||||||
|
populationInfoDTO.setIdcard(populationDTO.getCardNum());
|
||||||
|
populationInfoDTO.setName(populationDTO.getName());
|
||||||
|
populationInfoDTO.setPhone(populationDTO.getPhone());
|
||||||
|
populationInfoDTO.setIdcardType("身份证");
|
||||||
|
}
|
||||||
|
|
||||||
populationInfoService.getTuoMin(populationInfoDTO);
|
populationInfoService.getTuoMin(populationInfoDTO);
|
||||||
|
|
||||||
populationDTO.setCardNum(populationInfoDTO.getIdcard());
|
populationDTO.setCardNum(populationInfoDTO.getIdcard());
|
||||||
|
Loading…
Reference in New Issue
Block a user