更新

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

@@ -677,14 +677,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 
     @Override
     public CommonResult isCheck(String studentCard) {
-        WelcomeBed welcomeBed=welcomeBedService.isCheck(studentCard);
-        WelcomeBedCheckVo vo = new WelcomeBedCheckVo();
-        vo.setIsCheck(0);
-        if (ObjectUtils.isNotEmpty(welcomeBed)) {
-            vo.setIsCheck(welcomeBed.getIsCheck());
-            vo.setSchoolId(welcomeBed.getSchoolId());
-            vo.setBuildId(welcomeBed.getBuildId());
-            vo.setDormitoryId(welcomeBed.getDormitoryId());
+        WelcomeBedCheckVo vo=welcomeBedService.isCheck(studentCard);
+        if (ObjectUtils.isEmpty(vo)) {
+            vo.setIsCheck(0);
         }
         return CommonResult.ok(vo);
     }

src/main/java/com/template/mapper/WelcomeBedMapper.java

@@ -3,6 +3,7 @@ package com.template.mapper;
 import com.template.model.pojo.WelcomeBed;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.template.model.vo.BedDetailsVo;
+import com.template.model.vo.WelcomeBedCheckVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -23,4 +24,5 @@ public interface WelcomeBedMapper extends BaseMapper<WelcomeBed> {
 
     BedDetailsVo getBedDetailsVo(@Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId, @Param("dormitoryId") Integer dormitoryId, @Param("studentCard") String studentCard);
 
+    WelcomeBedCheckVo isCheck(@Param("studentCard") String studentCard);
 }

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

@@ -15,4 +15,17 @@ public class WelcomeBedCheckVo {
 
     @ApiModelProperty(value = "寝室ID")
     private Integer dormitoryId;
+
+    @ApiModelProperty(value = "校区名称")
+    private String school;
+
+    @ApiModelProperty(value = "楼栋名称")
+    private String build;
+
+    @ApiModelProperty(value = "寝室号")
+    private String dormitory;
+
+
 }
+
+

src/main/java/com/template/services/WelcomeBedService.java

@@ -5,6 +5,7 @@ import com.template.model.pojo.WelcomeBed;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.BedDetailsVo;
+import com.template.model.vo.WelcomeBedCheckVo;
 
 import java.util.List;
 
@@ -43,5 +44,5 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     List<WelcomeBed> queryBeds(List<Integer> dormitoryIds);
 
-    WelcomeBed isCheck(String studentCard);
+    WelcomeBedCheckVo isCheck(String studentCard);
 }

src/main/java/com/template/services/impl/WelcomeBedServiceImpl.java

@@ -10,6 +10,7 @@ import com.template.model.pojo.WelcomeBed;
 import com.template.mapper.WelcomeBedMapper;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.BedDetailsVo;
+import com.template.model.vo.WelcomeBedCheckVo;
 import com.template.services.WelcomeBedService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -154,10 +155,8 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public WelcomeBed isCheck(String studentCard) {
-        QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("student_card", studentCard);
-        WelcomeBed result = welcomeBedMapper.selectOne(queryWrapper);
+    public WelcomeBedCheckVo isCheck(String studentCard) {
+        WelcomeBedCheckVo result = welcomeBedMapper.isCheck(studentCard);
         return result;
     }
 

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

@@ -55,4 +55,25 @@
           AND wb.dormitory_id = #{dormitoryId}
           AND wb.student_card = #{studentCard}
     </select>
+    <select id="isCheck" resultType="com.template.model.vo.WelcomeBedCheckVo">
+        SELECT
+            wb.is_check as isCheck,
+            wb.school_id as schoolId,
+            wb.build_id as buildId,
+            wb.dormitory_id as dormitoryId,
+            ws.school,
+            w.build,
+            wd.dormitory
+        FROM
+            `welcome_bed` wb
+                LEFT JOIN welcome_school ws ON ws.id = wb.school_id
+                AND ws.deleted = 0
+                LEFT JOIN welcome_build w ON w.id = wb.build_id
+                AND w.deleted = 0
+                LEFT JOIN welcome_dormitory wd ON wd.id = wb.dormitory_id
+                AND wd.deleted = 0
+        WHERE
+            wb.deleted =0
+          AND wb.student_card= #{studentCard}
+    </select>
 </mapper>