夏文涛 vor 1 Jahr
Ursprung
Commit
aceb301d68

+ 2 - 1
src/main/java/com/template/controller/WelcomeStudentController.java

@@ -484,7 +484,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         WelcomeBed wsd = welcomeBedService.getBedByCardId(ws.getCardId());
         WelcomeBed wsd = welcomeBedService.getBedByCardId(ws.getCardId());
         if (wsd != null) {
         if (wsd != null) {
             result.setBuild(wsd.getBuild());
             result.setBuild(wsd.getBuild());
-            result.setBuildId(wsd.getBuild());
+            result.setBuildId(wsd.getBuildId());
             result.setDormitory(wsd.getDormitory());//寝室号
             result.setDormitory(wsd.getDormitory());//寝室号
             result.setDormitoryId(wsd.getDormitoryId());//寝室号
             result.setDormitoryId(wsd.getDormitoryId());//寝室号
             result.setBed(String.valueOf(wsd.getNumber()));//床位号
             result.setBed(String.valueOf(wsd.getNumber()));//床位号
@@ -546,6 +546,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         result.setTrafficMethod(ws.getTrafficMethod());
         result.setTrafficMethod(ws.getTrafficMethod());
         result.setArrive(ws.getArrive());
         result.setArrive(ws.getArrive());
         result.setArrvieDate(ws.getArrvieDate());
         result.setArrvieDate(ws.getArrvieDate());
+        result.setArriveTime(ws.getArriveTime());
         result.setArriveTimeId(ws.getArriveTimeId());
         result.setArriveTimeId(ws.getArriveTimeId());
         result.setAmountPayable(ws.getAmountPayable());
         result.setAmountPayable(ws.getAmountPayable());
         result.setPayAmount(ws.getPayAmount());
         result.setPayAmount(ws.getPayAmount());

+ 5 - 2
src/main/java/com/template/model/vo/StudentDetailVo.java

@@ -136,9 +136,12 @@ public class StudentDetailVo {
     private Date arrvieDate;
     private Date arrvieDate;
 
 
     @ApiModelProperty(value = "到站时间段")
     @ApiModelProperty(value = "到站时间段")
-    @JsonIgnore
     private Integer arriveTimeId;
     private Integer arriveTimeId;
 
 
+    @ApiModelProperty(value = "到站时间段")
+    private String arriveTime;
+
+
     @ApiModelProperty(value = "家庭成员集合")
     @ApiModelProperty(value = "家庭成员集合")
     private List<FamilyVo> fvs;
     private List<FamilyVo> fvs;
 
 
@@ -152,7 +155,7 @@ public class StudentDetailVo {
     private String build;
     private String build;
 
 
     @ApiModelProperty(value = "楼栋")
     @ApiModelProperty(value = "楼栋")
-    private String buildId;
+    private Integer buildId;
 
 
     @ApiModelProperty(value = "寝室号")
     @ApiModelProperty(value = "寝室号")
     private String dormitory;
     private String dormitory;