elink-star
/
epdc-cloud-custom-yushan
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug

master
zhangyuan 3 years ago
parent
fb0af0360b
commit
2b21b0324e
1 changed files with 2 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java

11
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
View File

@ -775,7 +775,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
if (StringUtils.isNotBlank(item.getIdCard())) { if (StringUtils.isNotBlank(item.getIdCard())) {
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity(); EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setIdCard(item.getIdCard()); entity.setIdCard(item.getIdCard());
entity.setUnitId(unitOptional.get().getUnitId()); entity.setUnitId(unitEntity.getId());
entity.setOwnerName(item.getUserName()); entity.setOwnerName(item.getUserName());
entity.setMobile(item.getMobile()); entity.setMobile(item.getMobile());
addOwner.add(entity); addOwner.add(entity);
@ -799,13 +799,6 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
addOwner.add(entity); addOwner.add(entity);
} }
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setIdCard(item.getIdCard());
entity.setUnitId(unitOptional.get().getUnitId());
entity.setOwnerName(item.getUserName());
entity.setMobile(item.getMobile());
addOwner.add(entity);
} else { } else {
Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(item.getPlot()) && build.getBuildingName().equals(item.getBuildingNo())).findFirst(); Optional<EpidemicPlotBuildingResultDTO> buildingOptional = buildingList.stream().filter(build -> build.getPlotName().equals(item.getPlot()) && build.getBuildingName().equals(item.getBuildingNo())).findFirst();
if (buildingOptional.isPresent()) { if (buildingOptional.isPresent()) {
@ -848,7 +841,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
if (StringUtils.isNotBlank(item.getIdCard())) { if (StringUtils.isNotBlank(item.getIdCard())) {
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity(); EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setIdCard(item.getIdCard()); entity.setIdCard(item.getIdCard());
entity.setUnitId(unitOptional.get().getUnitId()); entity.setUnitId(unitEntity.getId());
entity.setOwnerName(item.getUserName()); entity.setOwnerName(item.getUserName());
entity.setMobile(item.getMobile()); entity.setMobile(item.getMobile());
epidemicUnitOwnerService.deleteByIdCard(item.getIdCard()); epidemicUnitOwnerService.deleteByIdCard(item.getIdCard());

Write Preview
Loading…
Cancel
Save