更新

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

@@ -138,7 +138,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         wb.setGrade(iwbr.getGrade());
         wb.setCollegeId(iwbr.getCollegeId());
         wb.setCollege(iwbr.getCollege());
-        wb.setRetentionState(1);
+        wb.setRetentionState(iwbr.getRetentionState());
 
         int result = welcomeBedService.insertWelcomeBed(wb);
         return result > 0 ? CommonResult.ok("添加成功！") : CommonResult.fail("添加失败");

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.annotation.PassToken;
@@ -422,6 +423,14 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 //        //endregion
 
         try {
+//            获取床位数据
+            WelcomeBed bedByCardId = welcomeBedService.getBedByCardId(student.getCardId());
+            if (ObjectUtils.isNotEmpty(bedByCardId)) {
+                bedByCardId.setName(student.getName());
+                bedByCardId.setCardNum(student.getAdmissNum());
+                welcomeBedService.updateById(bedByCardId);
+            }
+
 
             int studentId = welcomeStudentService.updateWelcomeStudent(student);
             if (studentId <= 0) {

src/main/java/com/template/model/pojo/WelcomeBed.java

@@ -82,7 +82,7 @@ public class WelcomeBed implements Serializable {
     @ApiModelProperty(value = "是否入住 1：入住，0：未入住")
     private Integer isCheck;
 
-    @ApiModelProperty(value = "学号")
+    @ApiModelProperty(value = "录取号")
     private String cardNum;
 
     @ApiModelProperty(value = "姓名")