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

无身份证默认只导入房屋

master
zhangyuan 3 years ago
parent
61d0674748
commit
fb0af0360b
1 changed files with 48 additions and 25 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. 73
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java

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

@ -621,9 +621,10 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
String unit = baseResidentInformationUpdateExcel.getUnit() == null ? null : baseResidentInformationUpdateExcel.getUnit().trim(); String unit = baseResidentInformationUpdateExcel.getUnit() == null ? null : baseResidentInformationUpdateExcel.getUnit().trim();
String roomNo = baseResidentInformationUpdateExcel.getRoomNo() == null ? null : baseResidentInformationUpdateExcel.getRoomNo().trim(); String roomNo = baseResidentInformationUpdateExcel.getRoomNo() == null ? null : baseResidentInformationUpdateExcel.getRoomNo().trim();
if (StringUtils.isBlank(selfIdentityNo)) { // if (StringUtils.isBlank(selfIdentityNo)) {
errorInfo += "本人身份证号为空;"; // errorInfo += "本人身份证号为空;";
} else if (StringUtils.isNotBlank(selfIdentityNo)) { // } else
if (StringUtils.isNotBlank(selfIdentityNo)) {
String result = IdentityNoUtils.IdentityNoVerification(selfIdentityNo); String result = IdentityNoUtils.IdentityNoVerification(selfIdentityNo);
if (result != null) { if (result != null) {
errorInfo += "本人身份证号码有误;"; errorInfo += "本人身份证号码有误;";
@ -702,14 +703,20 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
item.setUnit(item.getUnit().trim().toUpperCase()); item.setUnit(item.getUnit().trim().toUpperCase());
item.setRoomNo(item.getRoomNo().trim().toUpperCase()); item.setRoomNo(item.getRoomNo().trim().toUpperCase());
}); });
epidemicUserInfoService.insertBatch(addList);
List<EpidemicUserInfoEntity> addListTrue = addList.stream().filter(item -> StringUtils.isNotBlank(item.getIdCard())).collect(Collectors.toList());
epidemicUserInfoService.insertBatch(addListTrue);
} }
if (!updateList.isEmpty()) { if (!updateList.isEmpty()) {
updateList.forEach(item -> { updateList.forEach(item -> {
item.setUnit(item.getUnit().trim().toUpperCase()); item.setUnit(item.getUnit().trim().toUpperCase());
item.setRoomNo(item.getRoomNo().trim().toUpperCase()); item.setRoomNo(item.getRoomNo().trim().toUpperCase());
}); });
epidemicUserInfoService.updateBatchById(updateList);
List<EpidemicUserInfoEntity> updListTrue = updateList.stream().filter(item -> StringUtils.isNotBlank(item.getIdCard())).collect(Collectors.toList());
epidemicUserInfoService.updateBatchById(updListTrue);
} }
// 补充人房关系 // 补充人房关系
@ -720,12 +727,14 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
// 只有信息完整的才进行匹配 // 只有信息完整的才进行匹配
Optional<EpidemicUnitInfoResultDTO> unitOptional = unitList.stream().filter(unit -> unit.getPlotName().equals(item.getPlot()) && unit.getBuildingName().equals(item.getBuildingNo()) && unit.getUnit().equals(item.getUnit()) && unit.getRoomNo().equals(item.getRoomNo())).findFirst(); Optional<EpidemicUnitInfoResultDTO> unitOptional = unitList.stream().filter(unit -> unit.getPlotName().equals(item.getPlot()) && unit.getBuildingName().equals(item.getBuildingNo()) && unit.getUnit().equals(item.getUnit()) && unit.getRoomNo().equals(item.getRoomNo())).findFirst();
if (unitOptional.isPresent()) { if (unitOptional.isPresent()) {
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity(); if (StringUtils.isNotBlank(item.getIdCard())) {
entity.setIdCard(item.getIdCard()); EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setUnitId(unitOptional.get().getUnitId()); entity.setIdCard(item.getIdCard());
entity.setOwnerName(item.getUserName()); entity.setUnitId(unitOptional.get().getUnitId());
entity.setMobile(item.getMobile()); entity.setOwnerName(item.getUserName());
addOwner.add(entity); 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()) {
@ -763,12 +772,14 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
newUnit.setRoomNo(item.getRoomNo().trim().toUpperCase()); newUnit.setRoomNo(item.getRoomNo().trim().toUpperCase());
unitList.add(newUnit); unitList.add(newUnit);
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity(); if (StringUtils.isNotBlank(item.getIdCard())) {
entity.setIdCard(item.getIdCard()); EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setUnitId(unitEntity.getId()); entity.setIdCard(item.getIdCard());
entity.setOwnerName(item.getUserName()); entity.setUnitId(unitOptional.get().getUnitId());
entity.setMobile(item.getMobile()); entity.setOwnerName(item.getUserName());
addOwner.add(entity); entity.setMobile(item.getMobile());
addOwner.add(entity);
}
} }
} }
} }
@ -778,12 +789,22 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
if (StringUtils.isNotBlank(item.getPlot()) && StringUtils.isNotBlank(item.getBuildingNo()) && StringUtils.isNotBlank(item.getUnit())) { if (StringUtils.isNotBlank(item.getPlot()) && StringUtils.isNotBlank(item.getBuildingNo()) && StringUtils.isNotBlank(item.getUnit())) {
Optional<EpidemicUnitInfoResultDTO> unitOptional = unitList.stream().filter(unit -> unit.getPlotName().equals(item.getPlot()) && unit.getBuildingName().equals(item.getBuildingNo()) && unit.getUnit().equals(item.getUnit()) && unit.getRoomNo().equals(item.getRoomNo())).findFirst(); Optional<EpidemicUnitInfoResultDTO> unitOptional = unitList.stream().filter(unit -> unit.getPlotName().equals(item.getPlot()) && unit.getBuildingName().equals(item.getBuildingNo()) && unit.getUnit().equals(item.getUnit()) && unit.getRoomNo().equals(item.getRoomNo())).findFirst();
if (unitOptional.isPresent()) { if (unitOptional.isPresent()) {
if (StringUtils.isNotBlank(item.getIdCard())) {
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setIdCard(item.getIdCard());
entity.setUnitId(unitOptional.get().getUnitId());
entity.setOwnerName(item.getUserName());
entity.setMobile(item.getMobile());
epidemicUnitOwnerService.deleteByIdCard(item.getIdCard());
addOwner.add(entity);
}
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity(); EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setIdCard(item.getIdCard()); entity.setIdCard(item.getIdCard());
entity.setUnitId(unitOptional.get().getUnitId()); entity.setUnitId(unitOptional.get().getUnitId());
entity.setOwnerName(item.getUserName()); entity.setOwnerName(item.getUserName());
entity.setMobile(item.getMobile()); entity.setMobile(item.getMobile());
epidemicUnitOwnerService.deleteByIdCard(item.getIdCard());
addOwner.add(entity); 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();
@ -824,13 +845,15 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
newUnit.setRoomNo(item.getRoomNo().trim().toUpperCase()); newUnit.setRoomNo(item.getRoomNo().trim().toUpperCase());
unitList.add(newUnit); unitList.add(newUnit);
EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity(); if (StringUtils.isNotBlank(item.getIdCard())) {
entity.setIdCard(item.getIdCard()); EpidemicUnitOwnerEntity entity = new EpidemicUnitOwnerEntity();
entity.setUnitId(unitEntity.getId()); entity.setIdCard(item.getIdCard());
entity.setOwnerName(item.getUserName()); entity.setUnitId(unitOptional.get().getUnitId());
entity.setMobile(item.getMobile()); entity.setOwnerName(item.getUserName());
epidemicUnitOwnerService.deleteByIdCard(item.getIdCard()); entity.setMobile(item.getMobile());
addOwner.add(entity); epidemicUnitOwnerService.deleteByIdCard(item.getIdCard());
addOwner.add(entity);
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save