功能优化

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

@@ -133,6 +133,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         ws.setPoliticalStatu(isr.getPoliticalStatu());
         ws.setNationality(isr.getNationality());
         ws.setPhone(isr.getPhone());
+        ws.setOprovince(isr.getOprovince());
+        ws.setOcity(isr.getOcity());
+        ws.setOdistrict(isr.getOdistrict());
         ws.setOprovinceId(isr.getOprovinceId());
         ws.setOcityId(isr.getOcityId());
         ws.setOdistrictId(isr.getOdistrictId());
@@ -144,6 +147,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         ws.setArrive(isr.getArrive());
         ws.setArrvieDate(isr.getArrvieDate());
         ws.setArriveTime(isr.getArriveTime());
+        ws.setArriveTimeId(isr.getArriveTimeId());
         ws.setZipCode(isr.getZipCode());
         ws.setRegisterOntime(isr.getRegisterOntime());
         //ws.setAmountPayable(isr.getAmountPayable());
@@ -154,8 +158,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
         //region 家庭成员数据
         List<WelcomeFamily> wfs = new ArrayList<>();
-        if (isr.getFamilys() != null && isr.getFamilys().size() > 0) {
-            for (InsertFamilyRequest family : isr.getFamilys()) {
+        if (isr.getFvs() != null && isr.getFvs().size() > 0) {
+            for (InsertFamilyRequest family : isr.getFvs()) {
                 if(!(StringUtils.hasText(family.getFamilyShip()) && StringUtils.hasText(family.getName())
                 && StringUtils.hasText(family.getWorkUnit()) && StringUtils.hasText(family.getPhone()))){
                     return CommonResult.fail("家庭成员信息不能为空！");
@@ -173,8 +177,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
         //region 陪同人员数据
         List<WelcomeAccompany> was = new ArrayList<>();
-        if (isr.getAccompanys() != null && isr.getAccompanys().size() > 0) {
-            for (InsertAccompanyRequest accompany : isr.getAccompanys()) {
+        if (isr.getAvs() != null && isr.getAvs().size() > 0) {
+            for (InsertAccompanyRequest accompany : isr.getAvs()) {
                 if(!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))){
                     return CommonResult.fail("陪同人员信息不能为空！");
                 }
@@ -275,6 +279,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         student.setPoliticalStatu(usr.getPoliticalStatu());
         student.setNationality(usr.getNationality());
         student.setPhone(usr.getPhone());
+        student.setOprovince(usr.getOprovince());
+        student.setOcity(usr.getOcity());
+        student.setOdistrict(usr.getOdistrict());
         student.setOprovinceId(usr.getOprovinceId());
         student.setOcityId(usr.getOcityId());
         student.setOdistrictId(usr.getOdistrictId());
@@ -286,6 +293,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         student.setArrive(usr.getArrive());
         student.setArrvieDate(usr.getArrvieDate());
         student.setArriveTime(usr.getArriveTime());
+        student.setArriveTimeId(usr.getArriveTimeId());
         student.setZipCode(usr.getZipCode());
         student.setRegisterOntime(usr.getRegisterOntime());
         //ws.setAmountPayable(isr.getAmountPayable());

src/main/java/com/template/model/request/InsertStudentRequest.java

@@ -110,6 +110,18 @@ public class InsertStudentRequest implements Serializable {
 
     @ApiModelProperty(value = "籍贯省")
     @NotNull(message = "籍贯省ID不能为空")
+    private String oprovince;
+
+    @ApiModelProperty(value = "籍贯市")
+    @NotNull(message = "籍贯市ID不能为空")
+    private String ocity;
+
+    @ApiModelProperty(value = "籍贯区")
+    @NotNull(message = "籍贯区ID不能为空")
+    private String odistrict;
+
+    @ApiModelProperty(value = "籍贯省")
+    @NotNull(message = "籍贯省ID不能为空")
     private Integer oprovinceId;
 
     @ApiModelProperty(value = "籍贯市")
@@ -152,6 +164,10 @@ public class InsertStudentRequest implements Serializable {
     @NotBlank(message = "到站时间不能为空")
     private String arriveTime;
 
+    @ApiModelProperty(value = "到站时间")
+    @NotBlank(message = "到站时间不能为空")
+    private Integer arriveTimeId;
+
     @ApiModelProperty(value = "邮编")
     @NotBlank(message = "邮编不能为空")
     private String zipCode;
@@ -173,10 +189,10 @@ public class InsertStudentRequest implements Serializable {
 //    private String carNumber;
 
     //家庭成员
-    private List<InsertFamilyRequest> familys;
+    private List<InsertFamilyRequest> fvs;
 
     //陪同人员
-    private List<InsertAccompanyRequest> accompanys;
+    private List<InsertAccompanyRequest> avs;
 
     //楼栋
     private String build;

src/main/java/com/template/model/request/updateStudentRequest.java

@@ -109,6 +109,18 @@ public class updateStudentRequest implements Serializable {
 
     @ApiModelProperty(value = "籍贯省")
     @NotNull(message = "籍贯省ID不能为空")
+    private String oprovince;
+
+    @ApiModelProperty(value = "籍贯市")
+    @NotNull(message = "籍贯市ID不能为空")
+    private String ocity;
+
+    @ApiModelProperty(value = "籍贯区")
+    @NotNull(message = "籍贯区ID不能为空")
+    private String odistrict;
+
+    @ApiModelProperty(value = "籍贯省")
+    @NotNull(message = "籍贯省ID不能为空")
     private Integer oprovinceId;
 
     @ApiModelProperty(value = "籍贯市")
@@ -151,6 +163,10 @@ public class updateStudentRequest implements Serializable {
     @NotBlank(message = "到站时间不能为空")
     private String arriveTime;
 
+    @ApiModelProperty(value = "到站时间")
+    @NotBlank(message = "到站时间不能为空")
+    private Integer arriveTimeId;
+
     @ApiModelProperty(value = "邮编")
     @NotBlank(message = "邮编不能为空")
     private String zipCode;

src/main/java/com/template/model/vo/StudentDetailVo.java

@@ -139,9 +139,6 @@ public class StudentDetailVo {
     @JsonIgnore
     private Integer arriveTimeId;
 
-    @ApiModelProperty(value = "到站时间段集合")
-    private List<ArriveTimeVo> ats;
-
     @ApiModelProperty(value = "家庭成员集合")
     private List<FamilyVo> fvs;