导入数据

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -1095,7 +1095,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 if (!addressDatas[0].contains("省")) {
                                     return CommonResult.fail("录取编号为\" + assNum + \"的籍贯格式应该是 省/市/县");
                                 }
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressDatas[0])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getProvinceZh().equals(addressDatas[0])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setOprovince(addressDatas[0]);
                                     studentData.setOprovinceId(oProvince.get().getId());
@@ -1104,7 +1104,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressDatas != null && addressDatas.length >= 2) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressDatas[1])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressDatas[1])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setOcity(addressDatas[1]);
                                     studentData.setOcityId(oProvince.get().getId());
@@ -1132,7 +1132,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 if (!addressPlaces[0].contains("省")) {
                                     return CommonResult.fail("录取编号为" + assNum + "的家庭住址格式应该是 省/市/县区");
                                 }
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressPlaces[0])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getProvinceZh().equals(addressPlaces[0])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setProvince(addressPlaces[0]);
                                     studentData.setProvinceId(oProvince.get().getId());
@@ -1141,7 +1141,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressPlaces != null && addressPlaces.length >= 2) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressPlaces[1])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressPlaces[1])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setCity(addressPlaces[1]);
                                     studentData.setCityId(oProvince.get().getId());
@@ -1357,7 +1357,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 if (!addressDatas[0].contains("省")) {
                                     return CommonResult.fail("录取编号为\" + assNum + \"的籍贯格式应该是 省/市/县区");
                                 }
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressDatas[0])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getProvinceZh().equals(addressDatas[0])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setOprovince(addressDatas[0]);
                                     studentData.setOprovinceId(oProvince.get().getId());
@@ -1366,7 +1366,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressDatas != null && addressDatas.length >= 2) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressDatas[1])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressDatas[1])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setOcity(addressDatas[1]);
                                     studentData.setOcityId(oProvince.get().getId());
@@ -1394,7 +1394,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 if (!addressPlaces[0].contains("省")) {
                                     return CommonResult.fail("录取编号为" + assNum + "的家庭住址格式应该是 省/市/县区");
                                 }
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressPlaces[0])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getProvinceZh().equals(addressPlaces[0])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setProvince(addressPlaces[0]);
                                     studentData.setProvinceId(oProvince.get().getId());
@@ -1403,7 +1403,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressPlaces != null && addressPlaces.length >= 2) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressPlaces[1])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressPlaces[1])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setCity(addressPlaces[1]);
                                     studentData.setCityId(oProvince.get().getId());