代码优化

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

@@ -123,6 +123,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         ws.setArrive(isr.getArrive());
         ws.setArrvieDate(isr.getArrvieDate());
         ws.setArriveTime(isr.getArriveTime());
+        ws.setZipCode(isr.getZipCode());
         //ws.setAmountPayable(isr.getAmountPayable());
         //ws.setPayAmount(isr.getPayAmount());
         //ws.setIsDrive(isr.getIsDrive());
@@ -247,6 +248,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         student.setArrive(usr.getArrive());
         student.setArrvieDate(usr.getArrvieDate());
         student.setArriveTime(usr.getArriveTime());
+        student.setZipCode(usr.getZipCode());
         //ws.setAmountPayable(isr.getAmountPayable());
         //ws.setPayAmount(isr.getPayAmount());
         //ws.setIsDrive(isr.getIsDrive());

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

@@ -116,6 +116,9 @@ public class InsertStudentRequest implements Serializable {
     @ApiModelProperty(value = "到站时间")
     private String arriveTime;
 
+    @ApiModelProperty(value = "邮编")
+    private String zipCode;
+
 //    @ApiModelProperty(value = "应缴金额")
 //    private BigDecimal amountPayable;
 //

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

@@ -24,9 +24,6 @@ public class InsertWelcomeBedRequest implements Serializable {
     @ApiModelProperty(value = "床位号")
     private Integer number;
 
-    @ApiModelProperty(value = "学生身份证号")
-    private String studentCard;
-
     @ApiModelProperty(value = "校区名称")
     private String school;
 

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

@@ -114,6 +114,9 @@ public class updateStudentRequest implements Serializable {
     @ApiModelProperty(value = "到站时间")
     private String arriveTime;
 
+    @ApiModelProperty(value = "邮编")
+    private String zipCode;
+
 //    @ApiModelProperty(value = "应缴金额")
 //    private BigDecimal amountPayable;
 //

src/main/resources/mapper/template/WelcomeStudentMapper.xml

@@ -22,8 +22,8 @@
         ws.id,ws.admiss_num,ws.name,ws.card_id,ws.college,ws.major,ws.classstr,
         ws.traffic_method,ws.arrive,ws.amount_payable,ws.pay_amount,
         CONCAT(wsd.building, '-', wsd.dormitory, '-', wsd.bed_num) as dormitory
-        left join welcome_student_dormitory wsd on wsd.deleted =0 and wsd.student_card = ws.card_id
         from welcome_student ws
+        left join welcome_student_dormitory wsd on wsd.deleted =0 and wsd.student_card = ws.card_id
         where ws.deleted = 0
         <if test="collegeId != null and collegeId != ''">
             ws.college_id = #{collegeId}
@@ -40,6 +40,6 @@
         <if test="name != null and name != ''">
             ws.name like '%' #{name} '%'
         </if>
-        order by rns.create_time desc
+        order by ws.update_time desc
     </select>
 </mapper>