夏文涛 1 year ago
parent
commit
f860d6ff22

+ 4 - 4
src/main/java/com/template/controller/WelcomeStudentController.java

@@ -313,8 +313,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         //region 家庭成员数据
         //region 家庭成员数据
 
 
         List<WelcomeFamily> wfs = new ArrayList<>();
         List<WelcomeFamily> wfs = new ArrayList<>();
-        if (usr.getFamilys() != null && usr.getFamilys().size() > 0) {
-            for (InsertFamilyRequest family : usr.getFamilys()) {
+        if (usr.getFvs() != null && usr.getFvs().size() > 0) {
+            for (InsertFamilyRequest family : usr.getFvs()) {
                 if(!(StringUtils.hasText(family.getFamilyShip()) && StringUtils.hasText(family.getName())
                 if(!(StringUtils.hasText(family.getFamilyShip()) && StringUtils.hasText(family.getName())
                         && StringUtils.hasText(family.getWorkUnit()) && StringUtils.hasText(family.getPhone()))){
                         && StringUtils.hasText(family.getWorkUnit()) && StringUtils.hasText(family.getPhone()))){
                     return CommonResult.fail("家庭成员信息不能为空!");
                     return CommonResult.fail("家庭成员信息不能为空!");
@@ -332,8 +332,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
 
         //region 陪同人员数据
         //region 陪同人员数据
         List<WelcomeAccompany> was = new ArrayList<>();
         List<WelcomeAccompany> was = new ArrayList<>();
-        if (usr.getAccompanys() != null && usr.getAccompanys().size() > 0) {
-            for (InsertAccompanyRequest accompany : usr.getAccompanys()) {
+        if (usr.getAvs() != null && usr.getAvs().size() > 0) {
+            for (InsertAccompanyRequest accompany : usr.getAvs()) {
                 if(!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))){
                 if(!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))){
                     return CommonResult.fail("陪同人员信息不能为空!");
                     return CommonResult.fail("陪同人员信息不能为空!");
                 }
                 }

+ 2 - 2
src/main/java/com/template/model/request/updateStudentRequest.java

@@ -200,10 +200,10 @@ public class updateStudentRequest implements Serializable {
 //    private String carNumber;
 //    private String carNumber;
 
 
     //家庭成员
     //家庭成员
-    private List<InsertFamilyRequest> familys;
+    private List<InsertFamilyRequest> fvs;
 
 
     //陪同人员
     //陪同人员
-    private List<InsertAccompanyRequest> accompanys;
+    private List<InsertAccompanyRequest> avs;
 
 
     //楼栋
     //楼栋
     private String build;
     private String build;