liu 1 year ago
parent
commit
0b8ab29e17

+ 8 - 3
src/main/java/com/template/controller/WelcomeBedController.java

@@ -17,6 +17,7 @@ import com.template.model.result.PageUtils;
 import com.template.model.vo.BedDetailsVo;
 import com.template.model.vo.ListVo;
 import com.template.model.vo.StudentPageVo;
+import com.template.model.vo.WelcomeBedCheckVo;
 import com.template.services.*;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -677,11 +678,15 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     @Override
     public CommonResult isCheck(String studentCard) {
         WelcomeBed welcomeBed=welcomeBedService.isCheck(studentCard);
-        Integer isCheck=0;
+        WelcomeBedCheckVo vo = new WelcomeBedCheckVo();
+        vo.setIsCheck(0);
         if (ObjectUtils.isNotEmpty(welcomeBed)) {
-            isCheck = welcomeBed.getIsCheck();
+            vo.setIsCheck(welcomeBed.getIsCheck());
+            vo.setSchoolId(welcomeBed.getSchoolId());
+            vo.setBuildId(welcomeBed.getBuildId());
+            vo.setDormitoryId(welcomeBed.getDormitoryId());
         }
-        return CommonResult.ok(isCheck);
+        return CommonResult.ok(vo);
     }
 }
 

+ 18 - 0
src/main/java/com/template/model/vo/WelcomeBedCheckVo.java

@@ -0,0 +1,18 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WelcomeBedCheckVo {
+    private Integer isCheck;
+
+    @ApiModelProperty(value = "校区ID")
+    private Integer schoolId;
+
+    @ApiModelProperty(value = "楼栋ID")
+    private Integer buildId;
+
+    @ApiModelProperty(value = "寝室ID")
+    private Integer dormitoryId;
+}