添加换床下拉框，床位对调下拉框，移动端提交宿舍下拉框

src/main/java/com/template/api/WelcomeBedControllerAPI.java

@@ -102,8 +102,42 @@ public interface WelcomeBedControllerAPI {
     @ApiOperation(value = "导出学生住宿信息", notes = "导出学生住宿信息", httpMethod = "GET")
     void studentAccommodationListExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,Integer majorId, Integer classstrId,String name);
 
-    @GetMapping(value = "/collegeBedGroup")
-    @ApiOperation(value = "学院床位分组", notes = "学院床位分组", httpMethod = "GET")
-    CommonResult collegeBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId);
+    @GetMapping(value = "/changeBuildGroup")
+    @ApiOperation(value = "换床楼栋分组", notes = "学院寝室分组", httpMethod = "GET")
+    CommonResult changeBuildGroup(Integer schoolId,Integer collegeId,String sex);
+
+    @GetMapping(value = "/changeDormitoryGroup")
+    @ApiOperation(value = "换床寝室分组", notes = "换床寝室分组", httpMethod = "GET")
+    CommonResult changeDormitoryGroup(Integer schoolId,Integer buildId,Integer collegeId,String sex);
+
+    @GetMapping(value = "/changeBedGroup")
+    @ApiOperation(value = "换床床位分组", notes = "换床床位分组", httpMethod = "GET")
+    CommonResult changeBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,String sex);
+
+
+    @GetMapping(value = "/replaceBuildGroup")
+    @ApiOperation(value = "换床楼栋分组", notes = "换床楼栋分组", httpMethod = "GET")
+    CommonResult replaceBuildGroup(Integer schoolId,Integer collegeId,String sex);
+
+    @GetMapping(value = "/replaceDormitoryGroup")
+    @ApiOperation(value = "换床寝室分组", notes = "换床寝室分组", httpMethod = "GET")
+    CommonResult replaceDormitoryGroup(Integer schoolId,Integer buildId,Integer collegeId,String sex);
+
+    @GetMapping(value = "/replaceBedGroup")
+    @ApiOperation(value = "换床床位分组", notes = "换床床位分组", httpMethod = "GET")
+    CommonResult replaceBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,String sex);
+
+
+    @GetMapping(value = "/hBuildGroup")
+    @ApiOperation(value = "移动端楼栋分组", notes = "学院寝室分组", httpMethod = "GET")
+    CommonResult hBuildGroup(Integer schoolId,Integer collegeId,Integer majorId,Integer classstrid,String sex);
+
+    @GetMapping(value = "/hDormitoryGroup")
+    @ApiOperation(value = "移动端寝室分组", notes = "移动端寝室分组", httpMethod = "GET")
+    CommonResult hDormitoryGroup(Integer schoolId,Integer buildId,Integer collegeId,Integer majorId,Integer classstrid,String sex);
+
+    @GetMapping(value = "/hBedGroup")
+    @ApiOperation(value = "移动端床位分组", notes = "移动端床位分组", httpMethod = "GET")
+    CommonResult hBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,Integer majorId,Integer classstrid,String sex);
 
 }

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

@@ -5,6 +5,7 @@ import com.alibaba.druid.sql.visitor.functions.If;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.template.api.WelcomeBedControllerAPI;
 import com.template.common.utils.BeanUtil;
 import com.template.common.utils.ExcelUtils;
@@ -40,9 +41,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -767,11 +766,14 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (bed.getIsCheck()==1) {
             return CommonResult.fail("该床位已被其他人入住");
         }
+
         if (!welcomeStudent.getCollegeId().equals(bed.getCollegeId())) {
             return CommonResult.fail("请勿跨学院入住");
         }
 
-
+        if (!welcomeStudent.getSex().equals(bed.getSex())) {
+            return CommonResult.fail("请勿跨性别入住");
+        }
 
         bed.setIsCheck(1);
         bed.setStudentCard(welcomeStudent.getCardId());
@@ -844,7 +846,11 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             return CommonResult.fail("床位不存在");
         }
         if (!sourceBed.getCollegeId().equals(changeBed.getCollegeId())) {
-            return CommonResult.fail("学院不同无法换床");
+            return CommonResult.fail("请勿跨学院换床位");
+        }
+
+        if (!sourceBed.getSex().equals(changeBed.getSex())) {
+            return CommonResult.fail("请勿跨性别换床位");
         }
 
         changeBed.setIsCheck(1);
@@ -915,7 +921,11 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         }
 
         if (!sourceBed.getCollegeId().equals(changeBed.getCollegeId())) {
-            return CommonResult.fail("学院不同无法床位对调");
+            return CommonResult.fail("请勿跨学院床位对调");
+        }
+
+        if (!sourceBed.getSex().equals(changeBed.getSex())) {
+            return CommonResult.fail("请勿跨性别对调床位");
         }
 
 //        源数据
@@ -1020,11 +1030,138 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public CommonResult collegeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId) {
+    public CommonResult changeBuildGroup(Integer schoolId, Integer collegeId, String sex) {
+        //        获取未入住的楼栋
+        List<WelcomeBed> beds = welcomeBedService.changeBuildGroup(schoolId,collegeId,sex);
+        ArrayList<ChangeBuildGroupVo> vos = new ArrayList<>();
+        for (WelcomeBed bed : beds) {
+            ChangeBuildGroupVo vo = new ChangeBuildGroupVo();
+            vo.setBuild(bed.getBuild());
+            vo.setBuildId(bed.getBuildId());
+            vos.add(vo);
+        }
+
+        return CommonResult.ok(vos);
+    }
+
+    @Override
+    public CommonResult changeDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex) {
+        //        获取未入住的寝室
+        List<WelcomeBed> beds = welcomeBedService.changeDormitoryGroup(schoolId,buildId,collegeId,sex);
+        ArrayList<ChangeDormitoryGroupVo> vos = new ArrayList<>();
+        for (WelcomeBed bed : beds) {
+            ChangeDormitoryGroupVo vo = new ChangeDormitoryGroupVo();
+            vo.setDormitory(bed.getDormitory());
+            vo.setDormitoryId(bed.getDormitoryId());
+            vos.add(vo);
+        }
+
+        return CommonResult.ok(vos);
+    }
+
+
+    @Override
+    public CommonResult changeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId,String sex) {
         //        获取未入住的床位
-        List<WelcomeBed> beds = welcomeBedService.collegeBedGroup(schoolId, buildId, dormitoryId,collegeId);
+        List<WelcomeBed> beds = welcomeBedService.changeBedGroup(schoolId, buildId, dormitoryId,collegeId,sex);
+        ArrayList<ChangeBedGroupVo> vos = new ArrayList<>();
+        for (WelcomeBed bed : beds) {
+            ChangeBedGroupVo vo = new ChangeBedGroupVo();
+            vo.setBedId(bed.getId());
+            vo.setNumber(bed.getNumber());
+            vos.add(vo);
+        }
+        return CommonResult.ok(vos);
+    }
 
-        return CommonResult.ok(beds);
+    @Override
+    public CommonResult replaceBuildGroup(Integer schoolId, Integer collegeId, String sex) {
+        //        获取已入住的楼栋
+        List<WelcomeBed> beds = welcomeBedService.replaceBuildGroup(schoolId,collegeId,sex);
+        ArrayList<ChangeBuildGroupVo> vos = new ArrayList<>();
+        for (WelcomeBed bed : beds) {
+            ChangeBuildGroupVo vo = new ChangeBuildGroupVo();
+            vo.setBuild(bed.getBuild());
+            vo.setBuildId(bed.getBuildId());
+            vos.add(vo);
+        }
+
+        return CommonResult.ok(vos);
+    }
+
+    @Override
+    public CommonResult replaceDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex) {
+        //        获取已入住的寝室
+        List<WelcomeBed> beds = welcomeBedService.replaceDormitoryGroup(schoolId,buildId,collegeId,sex);
+        ArrayList<ChangeDormitoryGroupVo> vos = new ArrayList<>();
+        for (WelcomeBed bed : beds) {
+            ChangeDormitoryGroupVo vo = new ChangeDormitoryGroupVo();
+            vo.setDormitory(bed.getDormitory());
+            vo.setDormitoryId(bed.getDormitoryId());
+            vos.add(vo);
+        }
+
+        return CommonResult.ok(vos);
+    }
+
+    @Override
+    public CommonResult replaceBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, String sex) {
+        //        获取已入住的床位
+        List<WelcomeBed> beds = welcomeBedService.replaceBedGroup(schoolId, buildId, dormitoryId,collegeId,sex);
+        ArrayList<ChangeBedGroupVo> vos = new ArrayList<>();
+        for (WelcomeBed bed : beds) {
+            ChangeBedGroupVo vo = new ChangeBedGroupVo();
+            vo.setBedId(bed.getId());
+            vo.setNumber(bed.getNumber());
+            vos.add(vo);
+        }
+        return CommonResult.ok(vos);
+    }
+
+    @Override
+    public CommonResult hBuildGroup(Integer schoolId, Integer collegeId, Integer majorId, Integer classstrid, String sex) {
+        //        获取未入住的楼栋
+        List<WelcomeBed> beds = welcomeBedService.hBuildGroup(schoolId,collegeId,majorId,classstrid,sex);
+        ArrayList<ChangeBuildGroupVo> vos = new ArrayList<>();
+        for (WelcomeBed bed : beds) {
+            ChangeBuildGroupVo vo = new ChangeBuildGroupVo();
+            vo.setBuild(bed.getBuild());
+            vo.setBuildId(bed.getBuildId());
+            vos.add(vo);
+        }
+
+        return CommonResult.ok(vos);
+    }
+
+    @Override
+    public CommonResult hDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, Integer majorId, Integer classstrid, String sex) {
+        //        获取未入住的寝室
+        List<WelcomeBed> beds = welcomeBedService.hDormitoryGroup(schoolId,buildId,collegeId,majorId,classstrid,sex);
+        ArrayList<ChangeDormitoryGroupVo> vos = new ArrayList<>();
+        for (WelcomeBed bed : beds) {
+            ChangeDormitoryGroupVo vo = new ChangeDormitoryGroupVo();
+            vo.setDormitory(bed.getDormitory());
+            vo.setDormitoryId(bed.getDormitoryId());
+            vos.add(vo);
+        }
+
+        return CommonResult.ok(vos);
     }
+
+    @Override
+    public CommonResult hBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrid, String sex) {
+        //        获取未入住的床位
+        List<WelcomeBed> beds = welcomeBedService.hBedGroup(schoolId, buildId, dormitoryId,collegeId,majorId,classstrid,sex);
+        ArrayList<ChangeBedGroupVo> vos = new ArrayList<>();
+        for (WelcomeBed bed : beds) {
+            ChangeBedGroupVo vo = new ChangeBedGroupVo();
+            vo.setBedId(bed.getId());
+            vo.setNumber(bed.getNumber());
+            vos.add(vo);
+        }
+        return CommonResult.ok(vos);
+    }
+
+
 }
 

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

@@ -75,11 +75,13 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         if (ObjectUtils.isNotEmpty(one)) {
             return CommonResult.fail("已存在该宿舍");
         }
-
+        if (ObjectUtils.isEmpty(welcomeDormitory.getRetentionState())) {
+            //        默认保留
+            welcomeDormitory.setRetentionState(1);
+        }
 //        添加时默认全空的
         welcomeDormitory.setStatus(2);
-//        默认保留
-        welcomeDormitory.setRetentionState(1);
+
         welcomeDormitory.setFreeBedNumber(welcomeDormitory.getBedNumber());
 
         boolean insertWd = welcomeDormitoryService.save(welcomeDormitory);
@@ -105,7 +107,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             welcomeBed.setCollegeId(welcomeDormitory.getCollegeId());
             welcomeBed.setGrade(welcomeDormitory.getGrade());
             welcomeBed.setIsCheck(0);
-            welcomeBed.setRetentionState(1);
+            welcomeBed.setRetentionState(welcomeDormitory.getRetentionState());
             welcomeBeds.add(welcomeBed);
         }
 

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

@@ -0,0 +1,9 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class ChangeBedGroupVo {
+    private Integer bedId;
+    private Integer number;
+}

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

@@ -0,0 +1,9 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class ChangeBuildGroupVo {
+    private Integer buildId;
+    private String build;
+}

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

@@ -0,0 +1,9 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class ChangeDormitoryGroupVo {
+    private Integer dormitoryId;
+    private String dormitory;
+}

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

@@ -61,4 +61,22 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
     void updateData(Integer bedId);
 
     List<WelcomeBed> collegeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId);
+
+    List<WelcomeBed> changeBuildGroup(Integer schoolId, Integer collegeId, String sex);
+
+    List<WelcomeBed> changeDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex);
+
+    List<WelcomeBed> changeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId,String sex);
+
+    List<WelcomeBed> replaceBuildGroup(Integer schoolId, Integer collegeId, String sex);
+
+    List<WelcomeBed> replaceDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex);
+
+    List<WelcomeBed> replaceBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, String sex);
+
+    List<WelcomeBed> hBuildGroup(Integer schoolId, Integer collegeId, Integer majorId, Integer classstrid, String sex);
+
+    List<WelcomeBed> hDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, Integer majorId, Integer classstrid, String sex);
+
+    List<WelcomeBed> hBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrid, String sex);
 }

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

@@ -229,6 +229,140 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         welcomeBedMapper.updateData(bedId);
     }
 
+
+
+    @Override
+    public List<WelcomeBed> changeBuildGroup(Integer schoolId, Integer collegeId, String sex) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getSex,sex)
+                .eq(WelcomeBed::getIsCheck, 0)
+                .eq(WelcomeBed::getRetentionState,1)
+                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeBed> changeDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
+                .eq(WelcomeBed::getBuildId,buildId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getSex,sex)
+                .eq(WelcomeBed::getIsCheck, 0)
+                .eq(WelcomeBed::getRetentionState,1)
+                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeBed> changeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId,String sex) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
+                .eq(WelcomeBed::getBuildId,buildId)
+                .eq(WelcomeBed::getDormitoryId,dormitoryId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getSex,sex)
+                .eq(WelcomeBed::getIsCheck, 0)
+                .eq(WelcomeBed::getRetentionState,1)
+                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId,WelcomeBed::getId);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeBed> replaceBuildGroup(Integer schoolId, Integer collegeId, String sex) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getSex,sex)
+                .eq(WelcomeBed::getIsCheck, 1)
+                .eq(WelcomeBed::getRetentionState,1)
+                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeBed> replaceDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, String sex) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
+                .eq(WelcomeBed::getBuildId,buildId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getSex,sex)
+                .eq(WelcomeBed::getIsCheck, 1)
+                .eq(WelcomeBed::getRetentionState,1)
+                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeBed> replaceBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, String sex) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
+                .eq(WelcomeBed::getBuildId,buildId)
+                .eq(WelcomeBed::getDormitoryId,dormitoryId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getSex,sex)
+                .eq(WelcomeBed::getIsCheck, 1)
+                .eq(WelcomeBed::getRetentionState,1)
+                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId,WelcomeBed::getId);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeBed> hBuildGroup(Integer schoolId, Integer collegeId, Integer majorId, Integer classstrid, String sex) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getMajorId,majorId)
+                .eq(WelcomeBed::getClassstrId,classstrid)
+                .eq(WelcomeBed::getSex,sex)
+                .eq(WelcomeBed::getIsCheck, 0)
+                .eq(WelcomeBed::getRetentionState,1)
+                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeBed> hDormitoryGroup(Integer schoolId, Integer buildId, Integer collegeId, Integer majorId, Integer classstrid, String sex) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
+                .eq(WelcomeBed::getBuildId,buildId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getMajorId,majorId)
+                .eq(WelcomeBed::getClassstrId,classstrid)
+                .eq(WelcomeBed::getSex,sex)
+                .eq(WelcomeBed::getIsCheck, 0)
+                .eq(WelcomeBed::getRetentionState,1)
+                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeBed> hBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrid, String sex) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId,schoolId)
+                .eq(WelcomeBed::getBuildId,buildId)
+                .eq(WelcomeBed::getDormitoryId,dormitoryId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getMajorId,majorId)
+                .eq(WelcomeBed::getClassstrId,classstrid)
+                .eq(WelcomeBed::getSex,sex)
+                .eq(WelcomeBed::getIsCheck, 0)
+                .eq(WelcomeBed::getRetentionState,1)
+                .groupBy(WelcomeBed::getSchoolId,WelcomeBed::getBuildId,WelcomeBed::getDormitoryId,WelcomeBed::getId);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
     @Override
     public List<WelcomeBed> collegeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
@@ -241,5 +375,4 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
-
 }