|
@@ -262,7 +262,7 @@ public class TestController {
|
|
|
if (sysRegions.size() > 0) {
|
|
|
SysRegion sysRegion = sysRegions.get(0);
|
|
|
if (sysRegion != null) {
|
|
|
- czrkJzdz.setProvinceId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setProvinceId(sysRegion.getAreaId().toString());
|
|
|
czrkJzdz.setProvince(province);
|
|
|
}
|
|
|
|
|
@@ -275,7 +275,7 @@ public class TestController {
|
|
|
if (sysRegions.size() > 0) {
|
|
|
SysRegion sysRegion = sysRegions.get(0);
|
|
|
if (sysRegion != null) {
|
|
|
- czrkJzdz.setCityId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setCityId(sysRegion.getAreaId().toString());
|
|
|
czrkJzdz.setCity(city);
|
|
|
}
|
|
|
}
|
|
@@ -289,10 +289,10 @@ public class TestController {
|
|
|
if (sysRegions.size() > 1) {
|
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
|
if (sysRegion != null) {
|
|
|
- Long cityId = czrkJzdz.getCityId();
|
|
|
- if (cityId != null) {
|
|
|
+ String cityId = czrkJzdz.getCityId();
|
|
|
+ if (StringUtils.isNotBlank(cityId)){
|
|
|
if (cityId.equals(sysRegion.getPid())) {
|
|
|
- czrkJzdz.setRegionId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setRegionId(sysRegion.getAreaId().toString());
|
|
|
czrkJzdz.setRegion(region);
|
|
|
}
|
|
|
}
|
|
@@ -301,7 +301,7 @@ public class TestController {
|
|
|
} else if (sysRegions.size() == 1) {
|
|
|
SysRegion sysRegion = sysRegions.get(0);
|
|
|
if (sysRegion != null) {
|
|
|
- czrkJzdz.setRegionId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setRegionId(sysRegion.getAreaId().toString());
|
|
|
czrkJzdz.setRegion(region);
|
|
|
}
|
|
|
}
|
|
@@ -314,9 +314,9 @@ public class TestController {
|
|
|
if (sysRegions.size() > 1) {
|
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
|
if (sysRegion != null) {
|
|
|
- Long regionId = czrkJzdz.getRegionId();
|
|
|
- if (regionId != null && regionId.equals(sysRegion.getPid())) {
|
|
|
- czrkJzdz.setTownId(sysRegion.getAreaId());
|
|
|
+ Long regionId = Long.parseLong(czrkJzdz.getRegionId());
|
|
|
+ if ( regionId.equals(Long.parseLong(sysRegion.getPid()))) {
|
|
|
+ czrkJzdz.setTownId(sysRegion.getAreaId().toString());
|
|
|
czrkJzdz.setTown(residenceTown);
|
|
|
}
|
|
|
}
|
|
@@ -324,7 +324,7 @@ public class TestController {
|
|
|
} else if (sysRegions.size() == 1) {
|
|
|
SysRegion sysRegion = sysRegions.get(0);
|
|
|
if (sysRegion != null) {
|
|
|
- czrkJzdz.setTownId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setTownId(sysRegion.getAreaId().toString());
|
|
|
czrkJzdz.setTown(residenceTown);
|
|
|
}
|
|
|
}
|
|
@@ -337,9 +337,9 @@ public class TestController {
|
|
|
if (sysRegions.size() > 1) {
|
|
|
for (SysRegion sysRegion : sysRegions) {
|
|
|
if (sysRegion != null) {
|
|
|
- Long townId = czrkJzdz.getTownId();
|
|
|
+ String townId = czrkJzdz.getTownId();
|
|
|
if (townId != null && townId.equals(sysRegion.getPid())) {
|
|
|
- czrkJzdz.setVillageId(sysRegion.getAreaId());
|
|
|
+ czrkJzdz.setVillageId(sysRegion.getAreaId().toString());
|
|
|
czrkJzdz.setVillage(residenceVillage);
|
|
|
}
|
|
|
}
|
|
@@ -347,7 +347,7 @@ public class TestController {
|
|
|
} else if (sysRegions.size() == 1) {
|
|
|
SysRegion sysRegion = sysRegions.get(0);
|
|
|
if (sysRegion != null) {
|
|
|
- czrkJzdz.setVillageId(sysRegions.get(0).getAreaId());
|
|
|
+ czrkJzdz.setVillageId(String.valueOf(sysRegions.get(0).getAreaId()));
|
|
|
czrkJzdz.setVillage(residenceVillage);
|
|
|
}
|
|
|
}
|
|
@@ -502,12 +502,12 @@ public class TestController {
|
|
|
if (StringUtils.isNotBlank(village) && StringUtils.isNotBlank(idCard)) {
|
|
|
//更新czrk_jzdz
|
|
|
czrkJzdz.setVillage(village);
|
|
|
- czrkJzdz.setVillageId(villageId);
|
|
|
+ czrkJzdz.setVillageId(String.valueOf(villageId));
|
|
|
} else {
|
|
|
System.out.println(czrk.getId() + "村名称或者身份证号码不存在,没有更新czrk_jzdz");
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(idCard)) {
|
|
|
- czrkJzdz.setTownId(czrk.getVillageTownsId());
|
|
|
+ czrkJzdz.setTownId(String.valueOf(czrk.getVillageTownsId()));
|
|
|
czrkJzdz.setTown(czrk.getVillageTowns());
|
|
|
czrkJzdz.setIdCard(idCard);
|
|
|
czrkJzdzMapper.updateByIdCard(czrkJzdz);
|
|
@@ -550,7 +550,7 @@ public class TestController {
|
|
|
String name = sysRegion.getName();
|
|
|
Long areaId = sysRegion.getAreaId();
|
|
|
czrkJzdz.setTown(name);
|
|
|
- czrkJzdz.setTownId(areaId);
|
|
|
+ czrkJzdz.setTownId(String.valueOf(areaId));
|
|
|
}
|
|
|
}
|
|
|
if (sysRegions.size() > 1) {
|
|
@@ -560,7 +560,7 @@ public class TestController {
|
|
|
String name = sysRegion.getName();
|
|
|
Long areaId = sysRegion.getAreaId();
|
|
|
czrkJzdz.setTown(name);
|
|
|
- czrkJzdz.setTownId(areaId);
|
|
|
+ czrkJzdz.setTownId(String.valueOf(areaId));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -576,7 +576,7 @@ public class TestController {
|
|
|
String name = sysRegion.getName();
|
|
|
Long areaId = sysRegion.getAreaId();
|
|
|
czrkJzdz.setVillage(name);
|
|
|
- czrkJzdz.setVillageId(areaId);
|
|
|
+ czrkJzdz.setVillageId(String.valueOf(areaId));
|
|
|
}
|
|
|
}
|
|
|
if (sysRegions.size() > 1) {
|
|
@@ -586,7 +586,7 @@ public class TestController {
|
|
|
String name = sysRegion.getName();
|
|
|
Long areaId = sysRegion.getAreaId();
|
|
|
czrkJzdz.setVillage(name);
|
|
|
- czrkJzdz.setVillageId(areaId);
|
|
|
+ czrkJzdz.setVillageId(String.valueOf(areaId));
|
|
|
}
|
|
|
}
|
|
|
}
|