|
@@ -135,15 +135,22 @@ public class TestController {
|
|
|
String villagerGroup = vaccineInfoOperation.getVillagerGroup();
|
|
|
if (StringUtils.isNotBlank(villagerGroup)) {
|
|
|
List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(villagerGroup);
|
|
|
- if (sysRegions.size() > 0) {
|
|
|
+ if (sysRegions.size() > 1) {
|
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
|
if (sysRegion != null) {
|
|
|
- if (czrk.getVillageTownsId().equals(sysRegion.getPid())) {
|
|
|
+ Long villageTownsId = czrk.getVillageTownsId();
|
|
|
+ if (villageTownsId != null && villageTownsId.equals(sysRegion.getPid())) {
|
|
|
czrk.setVillageId(sysRegion.getAreaId());
|
|
|
czrk.setVillageTowns(villagerGroup);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ } else if (sysRegions.size() == 1) {
|
|
|
+ SysRegion sysRegion = sysRegions.get(0);
|
|
|
+ if (sysRegion != null) {
|
|
|
+ czrk.setVillageId(sysRegion.getAreaId());
|
|
|
+ czrk.setVillageTowns(villagerGroup);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
czrk.setIsDel(vaccineInfoOperation.getIsDel());
|
|
@@ -163,8 +170,12 @@ public class TestController {
|
|
|
if (StringUtils.isNotBlank(province)) {
|
|
|
List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(province);
|
|
|
if (sysRegions.size() > 0) {
|
|
|
- czrkJzdz.setProvinceId(sysRegions.get(0).getAreaId());
|
|
|
- czrkJzdz.setProvince(province);
|
|
|
+ SysRegion sysRegion = sysRegions.get(0);
|
|
|
+ if (sysRegion != null) {
|
|
|
+ czrkJzdz.setProvinceId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setProvince(province);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
//现在居住地市
|
|
@@ -172,8 +183,11 @@ public class TestController {
|
|
|
if (StringUtils.isNotBlank(city)) {
|
|
|
List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(city);
|
|
|
if (sysRegions.size() > 0) {
|
|
|
- czrkJzdz.setCityId(sysRegions.get(0).getAreaId());
|
|
|
- czrkJzdz.setCity(city);
|
|
|
+ SysRegion sysRegion = sysRegions.get(0);
|
|
|
+ if (sysRegion != null) {
|
|
|
+ czrkJzdz.setCityId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setCity(city);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -181,15 +195,25 @@ public class TestController {
|
|
|
String region = vaccineInfoOperation.getRegion();
|
|
|
if (StringUtils.isNotBlank(region)) {
|
|
|
List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(region);
|
|
|
- if (sysRegions.size() > 0) {
|
|
|
+ //如果有多个区,名字相同的,切没有市的信息,则不赋值
|
|
|
+ if (sysRegions.size() > 1) {
|
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
|
if (sysRegion != null) {
|
|
|
- if (czrkJzdz.getCityId().equals(sysRegion.getPid())) {
|
|
|
- czrkJzdz.setRegionId(sysRegion.getAreaId());
|
|
|
- czrkJzdz.setRegion(region);
|
|
|
+ Long cityId = czrkJzdz.getCityId();
|
|
|
+ if (cityId != null) {
|
|
|
+ if (cityId.equals(sysRegion.getPid())) {
|
|
|
+ czrkJzdz.setRegionId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setRegion(region);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ } else if (sysRegions.size() == 1) {
|
|
|
+ SysRegion sysRegion = sysRegions.get(0);
|
|
|
+ if (sysRegion != null) {
|
|
|
+ czrkJzdz.setRegionId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setRegion(region);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -197,15 +221,22 @@ public class TestController {
|
|
|
String residenceTown = vaccineInfoOperation.getResidenceTown();
|
|
|
if (StringUtils.isNotBlank(residenceTown)) {
|
|
|
List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(residenceTown);
|
|
|
- if (sysRegions.size() > 0) {
|
|
|
+ if (sysRegions.size() > 1) {
|
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
|
if (sysRegion != null) {
|
|
|
- if (czrkJzdz.getRegionId().equals(sysRegion.getPid())) {
|
|
|
+ Long regionId = czrkJzdz.getRegionId();
|
|
|
+ if (regionId != null && regionId.equals(sysRegion.getPid())) {
|
|
|
czrkJzdz.setTownId(sysRegion.getAreaId());
|
|
|
czrkJzdz.setTown(residenceTown);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ } else if (sysRegions.size() == 1) {
|
|
|
+ SysRegion sysRegion = sysRegions.get(0);
|
|
|
+ if (sysRegion != null) {
|
|
|
+ czrkJzdz.setTownId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setTown(residenceTown);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -213,15 +244,22 @@ public class TestController {
|
|
|
String residenceVillage = vaccineInfoOperation.getResidenceVillage();
|
|
|
if (StringUtils.isNotBlank(residenceVillage)) {
|
|
|
List<SysRegion> sysRegions = sysRegionMapper.selectSysRegionByName(residenceVillage);
|
|
|
- if (sysRegions.size() > 0) {
|
|
|
+ if (sysRegions.size() > 1) {
|
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
|
if (sysRegion != null) {
|
|
|
- if (czrkJzdz.getTownId().equals(sysRegion.getPid())) {
|
|
|
+ Long townId = czrkJzdz.getTownId();
|
|
|
+ if (townId != null && townId.equals(sysRegion.getPid())) {
|
|
|
czrkJzdz.setVillageId(sysRegion.getAreaId());
|
|
|
czrkJzdz.setVillage(residenceVillage);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ } else if (sysRegions.size() == 1) {
|
|
|
+ SysRegion sysRegion = sysRegions.get(0);
|
|
|
+ if (sysRegion != null) {
|
|
|
+ czrkJzdz.setVillageId(sysRegions.get(0).getAreaId());
|
|
|
+ czrkJzdz.setVillage(residenceVillage);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
czrkJzdz.setNowIn(vaccineInfoOperation.getNowIn());
|