Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

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

@@ -6,10 +6,7 @@ import com.template.model.request.InfoCollectionRequest;
 import com.template.model.request.InsertWelcomeBedRequest;
 import com.template.model.request.UpdateWelcomeBedRequest;
 import com.template.model.result.CommonResult;
-import com.template.model.vo.BatchOperationBedVo;
-import com.template.model.vo.BatchOperationVo;
-import com.template.model.vo.ChangeBedVo;
-import com.template.model.vo.CheckInVo;
+import com.template.model.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
@@ -35,7 +32,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "/queryPageBeds")
     @ApiOperation(value = "床位信息分页数据", notes = "床位信息分页数据", httpMethod = "GET")
-    CommonResult queryPageBeds(@RequestParam int currentPage, @RequestParam int pageCount, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId);
+    CommonResult queryPageBeds(@RequestParam int currentPage, @RequestParam int pageCount, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState);
 
     @GetMapping(value = "/deleteBedInfo")
     @ApiOperation(value = "删除床位信息", notes = "删除床位信息", httpMethod = "GET")
@@ -85,7 +82,20 @@ public interface WelcomeBedControllerAPI {
     @ApiOperation(value = "换床", notes = "换床", httpMethod = "POST")
     CommonResult changeBed(@RequestBody ChangeBedVo changeBedVo);
 
+    @GetMapping(value = "/checkInBedGroup")
+    @ApiOperation(value = "入住床位分组", notes = "入住床位分组", httpMethod = "GET")
+    CommonResult checkInBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId);
+
     @PostMapping(value = "/replaceBed")
     @ApiOperation(value = "床位对调", notes = "床位对调", httpMethod = "POST")
-    CommonResult replaceBed(@RequestParam Integer bedId);
+    CommonResult replaceBed(@RequestBody ReplaceBedVo replaceBedVo);
+
+    @GetMapping(value = "/studentAccommodationPage")
+    @ApiOperation(value = "学生住宿分页展示", notes = "学生住宿分页展示", httpMethod = "GET")
+    CommonResult studentAccommodationPage(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,Integer majorId, Integer classstrId,String name);
+
+    @GetMapping(value = "/studentAccommodationListExport")
+    @ApiOperation(value = "导出学生住宿信息", notes = "导出学生住宿信息", httpMethod = "GET")
+    void studentAccommodationListExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,Integer majorId, Integer classstrId,String name);
+
 }

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

@@ -31,7 +31,7 @@ public interface WelcomeDormitoryControllerAPI {
 
     @GetMapping(value = "/listDormitory")
     @ApiOperation(value = "查询寝室", notes = "查询寝室", httpMethod = "GET")
-    CommonResult listDormitory(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId);
+    CommonResult listDormitory(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId,Integer retentionState);
 
 
     @GetMapping(value = "/dormitoryGroup")

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

@@ -168,8 +168,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public CommonResult queryPageBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
-        PageUtils<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId);
+    public CommonResult queryPageBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState) {
+        PageUtils<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId,retentionState);
         return CommonResult.ok(result);
     }
 
@@ -282,43 +282,48 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         if (!number.equals("床位号")) {
                             return CommonResult.fail("导入数据第四列为床位号");
                         }
-                        String sex = dataFormatter.formatCellValue(row.getCell(5));//楼栋层数
+                        String sex = dataFormatter.formatCellValue(row.getCell(5));//床位性别
                         if (!sex.equals("床位性别")) {
                             return CommonResult.fail("导入数据第五列为床位性别");
                         }
-                        String college = dataFormatter.formatCellValue(row.getCell(6));//起始层数
+
+                        String grade = dataFormatter.formatCellValue(row.getCell(6));//所属年级
+                        if (!grade.equals("所属年级")) {
+                            return CommonResult.fail("导入数据第五列为所属年级");
+                        }
+                        String college = dataFormatter.formatCellValue(row.getCell(7));//所属学院
                         if (!college.equals("所属学院")) {
                             return CommonResult.fail("导入数据第六列为所属学院");
                         }
-                        String major = dataFormatter.formatCellValue(row.getCell(7));//备注
+                        String major = dataFormatter.formatCellValue(row.getCell(8));//所属专业
                         if (!major.equals("所属专业")) {
                             return CommonResult.fail("导入数据第七列为所属专业");
                         }
-                        String classstr = dataFormatter.formatCellValue(row.getCell(8));//备注
+                        String classstr = dataFormatter.formatCellValue(row.getCell(9));//备注
                         if (!classstr.equals("所属班级")) {
                             return CommonResult.fail("导入数据第八列为所属班级");
                         }
-                        String instructor = dataFormatter.formatCellValue(row.getCell(9));//备注
+                        String instructor = dataFormatter.formatCellValue(row.getCell(10));//备注
                         if (!instructor.equals("辅导员")) {
                             return CommonResult.fail("导入数据第九列为辅导员");
                         }
-                        String isCheck = dataFormatter.formatCellValue(row.getCell(10));//备注
+                        String isCheck = dataFormatter.formatCellValue(row.getCell(11));//备注
                         if (!isCheck.equals("是否入住")) {
                             return CommonResult.fail("导入数据第十列为是否入住");
                         }
-                        String admissNum = dataFormatter.formatCellValue(row.getCell(11));//备注
+                        String admissNum = dataFormatter.formatCellValue(row.getCell(12));//备注
                         if (!admissNum.equals("录取号")) {
                             return CommonResult.fail("导入数据第十一列为录取号");
                         }
-                        String name = dataFormatter.formatCellValue(row.getCell(12));//备注
+                        String name = dataFormatter.formatCellValue(row.getCell(13));//备注
                         if (!name.equals("姓名")) {
                             return CommonResult.fail("导入数据第十二列为姓名");
                         }
-                        String remark = dataFormatter.formatCellValue(row.getCell(13));//备注
+                        String remark = dataFormatter.formatCellValue(row.getCell(14));//备注
                         if (!remark.equals("备注")) {
                             return CommonResult.fail("导入数据第十三列为备注");
                         }
-                        String retentionState = dataFormatter.formatCellValue(row.getCell(14));//是否保留
+                        String retentionState = dataFormatter.formatCellValue(row.getCell(15));//是否保留
                         if (!retentionState.equals("是否保留")) {
                             return CommonResult.fail("导入数据第十四列为是否保留");
                         }
@@ -337,15 +342,16 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         }
 
                         String sex = dataFormatter.formatCellValue(row.getCell(5));//楼栋层数
-                        String college = dataFormatter.formatCellValue(row.getCell(6));//起始层数
-                        String major = dataFormatter.formatCellValue(row.getCell(7));//备注
-                        String classstr = dataFormatter.formatCellValue(row.getCell(8));//备注
-                        String instructor = dataFormatter.formatCellValue(row.getCell(9));//辅导员
-                        String isCheck = dataFormatter.formatCellValue(row.getCell(10));//备注
-                        String admissNum = dataFormatter.formatCellValue(row.getCell(11));//备注
-                        String name = dataFormatter.formatCellValue(row.getCell(12));//备注
-                        String remark = dataFormatter.formatCellValue(row.getCell(13));//备注
-                        String retentionState = dataFormatter.formatCellValue(row.getCell(14));//是否保留
+                        String grade = dataFormatter.formatCellValue(row.getCell(6));//起始层数
+                        String college = dataFormatter.formatCellValue(row.getCell(7));//起始层数
+                        String major = dataFormatter.formatCellValue(row.getCell(8));//备注
+                        String classstr = dataFormatter.formatCellValue(row.getCell(9));//备注
+                        String instructor = dataFormatter.formatCellValue(row.getCell(10));//辅导员
+                        String isCheck = dataFormatter.formatCellValue(row.getCell(11));//备注
+                        String admissNum = dataFormatter.formatCellValue(row.getCell(12));//备注
+                        String name = dataFormatter.formatCellValue(row.getCell(13));//备注
+                        String remark = dataFormatter.formatCellValue(row.getCell(14));//备注
+                        String retentionState = dataFormatter.formatCellValue(row.getCell(15));//是否保留
 
 
                         bedData.setSchool(school);
@@ -397,6 +403,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         bedData.setRemark(remark);
                         bedData.setRetentionState(Integer.valueOf(retentionState));
                         bedData.setInstructor(instructor);
+                        bedData.setGrade(Integer.valueOf(grade));
                         result.add(bedData);
                     }
                 }
@@ -465,39 +472,44 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         if (!sex.equals("床位性别")) {
                             return CommonResult.fail("导入数据第五列为床位性别");
                         }
-                        String college = dataFormatter.formatCellValue(row.getCell(6));//起始层数
+                        String grade = dataFormatter.formatCellValue(row.getCell(6));//起始层数
+                        if (!grade.equals("所属年级")) {
+                            return CommonResult.fail("导入数据第六列为所属年级");
+                        }
+
+                        String college = dataFormatter.formatCellValue(row.getCell(7));//起始层数
                         if (!college.equals("所属学院")) {
                             return CommonResult.fail("导入数据第六列为所属学院");
                         }
-                        String major = dataFormatter.formatCellValue(row.getCell(7));//备注
+                        String major = dataFormatter.formatCellValue(row.getCell(8));//备注
                         if (!major.equals("所属专业")) {
                             return CommonResult.fail("导入数据第七列为所属专业");
                         }
-                        String classstr = dataFormatter.formatCellValue(row.getCell(8));//备注
+                        String classstr = dataFormatter.formatCellValue(row.getCell(9));//备注
                         if (!classstr.equals("所属班级")) {
                             return CommonResult.fail("导入数据第八列为所属班级");
                         }
-                        String instructor = dataFormatter.formatCellValue(row.getCell(9));//备注
+                        String instructor = dataFormatter.formatCellValue(row.getCell(10));//备注
                         if (!instructor.equals("辅导员")) {
                             return CommonResult.fail("导入数据第九列为辅导员");
                         }
-                        String isCheck = dataFormatter.formatCellValue(row.getCell(10));//备注
+                        String isCheck = dataFormatter.formatCellValue(row.getCell(11));//备注
                         if (!isCheck.equals("是否入住")) {
                             return CommonResult.fail("导入数据第十列为是否入住");
                         }
-                        String admissNum = dataFormatter.formatCellValue(row.getCell(11));//备注
+                        String admissNum = dataFormatter.formatCellValue(row.getCell(12));//备注
                         if (!admissNum.equals("录取号")) {
                             return CommonResult.fail("导入数据第十一列为录取号");
                         }
-                        String name = dataFormatter.formatCellValue(row.getCell(12));//备注
+                        String name = dataFormatter.formatCellValue(row.getCell(13));//备注
                         if (!name.equals("姓名")) {
                             return CommonResult.fail("导入数据第十二列为姓名");
                         }
-                        String remark = dataFormatter.formatCellValue(row.getCell(13));//备注
+                        String remark = dataFormatter.formatCellValue(row.getCell(14));//备注
                         if (!remark.equals("备注")) {
                             return CommonResult.fail("导入数据第十三列为备注");
                         }
-                        String retentionState = dataFormatter.formatCellValue(row.getCell(14));//是否保留
+                        String retentionState = dataFormatter.formatCellValue(row.getCell(15));//是否保留
                         if (!retentionState.equals("是否保留")) {
                             return CommonResult.fail("导入数据第十四列为是否保留");
                         }
@@ -515,15 +527,16 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         }
 
                         String sex = dataFormatter.formatCellValue(row.getCell(5));//楼栋层数
-                        String college = dataFormatter.formatCellValue(row.getCell(6));//起始层数
-                        String major = dataFormatter.formatCellValue(row.getCell(7));//备注
-                        String classstr = dataFormatter.formatCellValue(row.getCell(8));//备注
-                        String instructor = dataFormatter.formatCellValue(row.getCell(9));//辅导员
-                        String isCheck = dataFormatter.formatCellValue(row.getCell(10));//备注
-                        String admissNum = dataFormatter.formatCellValue(row.getCell(11));//备注
-                        String name = dataFormatter.formatCellValue(row.getCell(12));//备注
-                        String remark = dataFormatter.formatCellValue(row.getCell(13));//备注
-                        String retentionState = dataFormatter.formatCellValue(row.getCell(14));//是否保留
+                        String grade = dataFormatter.formatCellValue(row.getCell(6));//起始层数
+                        String college = dataFormatter.formatCellValue(row.getCell(7));//起始层数
+                        String major = dataFormatter.formatCellValue(row.getCell(8));//备注
+                        String classstr = dataFormatter.formatCellValue(row.getCell(9));//备注
+                        String instructor = dataFormatter.formatCellValue(row.getCell(10));//辅导员
+                        String isCheck = dataFormatter.formatCellValue(row.getCell(11));//备注
+                        String admissNum = dataFormatter.formatCellValue(row.getCell(12));//备注
+                        String name = dataFormatter.formatCellValue(row.getCell(13));//备注
+                        String remark = dataFormatter.formatCellValue(row.getCell(14));//备注
+                        String retentionState = dataFormatter.formatCellValue(row.getCell(15));//是否保留
 
                         bedData.setSchool(school);
 
@@ -574,6 +587,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         bedData.setRemark(remark);
                         bedData.setRetentionState(Integer.valueOf(retentionState));
                         bedData.setInstructor(instructor);
+                        bedData.setGrade(Integer.valueOf(grade));
                         result.add(bedData);
                     }
                 }
@@ -588,7 +602,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 
     @Override
     public CommonResult downloadBedExcel() {
-        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/alumnus/home/image/床位信息管理.xlsx");
+        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/welcome/homeimage/床位信息管理.xlsx");
     }
 
     @Override
@@ -606,15 +620,16 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         headerRow.createCell(3).setCellValue("寝室号");
         headerRow.createCell(4).setCellValue("床位号");
         headerRow.createCell(5).setCellValue("床位性别");
-        headerRow.createCell(6).setCellValue("所属学院");
-        headerRow.createCell(7).setCellValue("所属专业");
-        headerRow.createCell(8).setCellValue("所属班级");
-        headerRow.createCell(9).setCellValue("辅导员");
-        headerRow.createCell(10).setCellValue("是否入住");
-        headerRow.createCell(11).setCellValue("录取号");
-        headerRow.createCell(12).setCellValue("姓名");
-        headerRow.createCell(13).setCellValue("备注");
-        headerRow.createCell(14).setCellValue("是否保留");
+        headerRow.createCell(6).setCellValue("所属年级");
+        headerRow.createCell(7).setCellValue("所属学院");
+        headerRow.createCell(8).setCellValue("所属专业");
+        headerRow.createCell(9).setCellValue("所属班级");
+        headerRow.createCell(10).setCellValue("辅导员");
+        headerRow.createCell(11).setCellValue("是否入住");
+        headerRow.createCell(12).setCellValue("录取号");
+        headerRow.createCell(13).setCellValue("姓名");
+        headerRow.createCell(14).setCellValue("备注");
+        headerRow.createCell(15).setCellValue("是否保留");
         for (int i = 0; i < result.size(); i++) {
             WelcomeBed bed = result.get(i);
             Row dataRow = sheet.createRow(i + 1);
@@ -624,15 +639,16 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             dataRow.createCell(3).setCellValue(bed.getDormitory());
             dataRow.createCell(4).setCellValue(bed.getNumber());
             dataRow.createCell(5).setCellValue(bed.getSex());
-            dataRow.createCell(6).setCellValue(bed.getCollege());
-            dataRow.createCell(7).setCellValue(bed.getMajor());
-            dataRow.createCell(8).setCellValue(bed.getClassstr());
-            dataRow.createCell(9).setCellValue(bed.getInstructor());
-            dataRow.createCell(10).setCellValue(bed.getIsCheck());
-            dataRow.createCell(11).setCellValue(bed.getCardNum());
-            dataRow.createCell(12).setCellValue(bed.getName());
-            dataRow.createCell(13).setCellValue(bed.getRemark());
-            dataRow.createCell(14).setCellValue(bed.getRetentionState());
+            dataRow.createCell(6).setCellValue(bed.getGrade());
+            dataRow.createCell(7).setCellValue(bed.getCollege());
+            dataRow.createCell(8).setCellValue(bed.getMajor());
+            dataRow.createCell(9).setCellValue(bed.getClassstr());
+            dataRow.createCell(10).setCellValue(bed.getInstructor());
+            dataRow.createCell(11).setCellValue(bed.getIsCheck());
+            dataRow.createCell(12).setCellValue(bed.getCardNum());
+            dataRow.createCell(13).setCellValue(bed.getName());
+            dataRow.createCell(14).setCellValue(bed.getRemark());
+            dataRow.createCell(15).setCellValue(bed.getRetentionState());
 
         }
         // 将工作簿写入文件
@@ -654,6 +670,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (wb == null) {
             return CommonResult.fail("床位已失效，选择失败！");
         }
+        if (wb.getIsCheck()==1) {
+            return CommonResult.fail("该床位已被其他人入住");
+        }
 
         if (StringUtils.hasText(wb.getStudentCard()) && !wb.getStudentCard().equals(welcomeBed.getStudentCard())) {
             return CommonResult.fail("该床位已被其他人入住，选择失败！");
@@ -743,12 +762,18 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (ObjectUtils.isEmpty(bed)) {
             return CommonResult.fail("不存在该床铺");
         }
+        if (bed.getIsCheck()==1) {
+            return CommonResult.fail("该床位已被其他人入住");
+        }
+
         bed.setIsCheck(1);
         bed.setStudentCard(welcomeStudent.getCardId());
         bed.setCardNum(welcomeStudent.getAdmissNum());
         bed.setClassstrId(welcomeStudent.getClassstrId());
         bed.setClassstr(welcomeStudent.getClassstr());
         bed.setName(welcomeStudent.getName());
+        bed.setMajorId(welcomeStudent.getMajorId());
+        bed.setMajor(welcomeStudent.getMajor());
         welcomeBedService.updateWelcomeBed(bed);
 
 //        修改寝室信息
@@ -819,6 +844,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         changeBed.setClassstrId(sourceBed.getClassstrId());
         changeBed.setClassstr(sourceBed.getClassstr());
         changeBed.setName(sourceBed.getName());
+        changeBed.setMajorId(sourceBed.getMajorId());
+        changeBed.setMajor(sourceBed.getMajor());
+        changeBed.setInstructor(sourceBed.getInstructor());
         welcomeBeds.add(changeBed);
 
         sourceBed.setIsCheck(0);
@@ -827,6 +855,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         sourceBed.setClassstrId(null);
         sourceBed.setClassstr(null);
         sourceBed.setName(null);
+        sourceBed.setMajorId(null);
+        sourceBed.setMajor(null);
+        sourceBed.setInstructor(null);
         welcomeBeds.add(sourceBed);
 
         //        修改寝室信息
@@ -843,7 +874,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             }
             welcomeDormitoryService.updateById(welcomeDormitoryC);
         }
-        
+
         //        修改寝室信息
         WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getById(sourceBed.getDormitoryId());
         if (ObjectUtils.isNotEmpty(welcomeDormitory)) {
@@ -866,8 +897,116 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public CommonResult replaceBed(Integer bedId) {
-        return null;
+    public CommonResult checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId) {
+        //        获取已入住的床位
+        List<WelcomeBed> beds = welcomeBedService.checkInBedGroup(schoolId, buildId, dormitoryId);
+
+        return CommonResult.ok(beds);
+    }
+
+    @Override
+    public CommonResult replaceBed(ReplaceBedVo replaceBedVo) {
+        Integer sourceBedId = replaceBedVo.getSourceBedId();
+        Integer changeBedId = replaceBedVo.getChangeBedId();
+        WelcomeBed sourceBed = welcomeBedService.getBedById(sourceBedId);
+        WelcomeBed changeBed = welcomeBedService.getBedById(changeBedId);
+        if (ObjectUtils.isEmpty(sourceBed) || ObjectUtils.isEmpty(changeBed)) {
+            return CommonResult.fail("床位不存在");
+        }
+//        源数据
+        String studentCard = sourceBed.getStudentCard();
+        String cardNum = sourceBed.getCardNum();
+        Integer classstrId = sourceBed.getClassstrId();
+        String classstr = sourceBed.getClassstr();
+        String name = sourceBed.getName();
+        Integer majorId = sourceBed.getMajorId();
+        String major = sourceBed.getMajor();
+        String instructor = sourceBed.getInstructor();
+
+//        交换床位数据
+        String studentCard2 = changeBed.getStudentCard();
+        String cardNum2 = changeBed.getCardNum();
+        Integer classstrId2 = changeBed.getClassstrId();
+        String classstr2 = changeBed.getClassstr();
+        String name2 = changeBed.getName();
+        Integer majorId2 = changeBed.getMajorId();
+        String major2 = changeBed.getMajor();
+        String instructor2 = changeBed.getInstructor();
+
+
+        sourceBed.setStudentCard(studentCard2);
+        sourceBed.setCardNum(cardNum2);
+        sourceBed.setClassstrId(classstrId2);
+        sourceBed.setClassstr(classstr2);
+        sourceBed.setName(name2);
+        sourceBed.setMajorId(majorId2);
+        sourceBed.setMajor(major2);
+        sourceBed.setInstructor(instructor2);
+
+        changeBed.setStudentCard(studentCard);
+        changeBed.setCardNum(cardNum);
+        changeBed.setClassstrId(classstrId);
+        changeBed.setClassstr(classstr);
+        changeBed.setName(name);
+        changeBed.setMajorId(majorId);
+        changeBed.setMajor(major);
+        changeBed.setInstructor(instructor);
+
+        ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
+        welcomeBeds.add(sourceBed);
+        welcomeBeds.add(changeBed);
+
+        welcomeBedService.updateBatchById(welcomeBeds);
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name) {
+        PageUtils<WelcomeBed> result = welcomeBedService.studentAccommodationPage(currentPage, pageCount, schoolId, buildId, dormitoryId,collegeId, majorId, classstrId,name);
+        return CommonResult.ok(result);
+    }
+
+    @Override
+    public void studentAccommodationListExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name) {
+        List<WelcomeBed> result=welcomeBedService.studentAccommodationList( schoolId, buildId, dormitoryId,collegeId, majorId, classstrId,name);
+
+        //导出
+        Workbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("床位信息");
+
+        Row headerRow = sheet.createRow(0);
+        headerRow.createCell(0).setCellValue("序号");
+        headerRow.createCell(1).setCellValue("录取号");
+        headerRow.createCell(2).setCellValue("学生姓名");
+        headerRow.createCell(3).setCellValue("校区名称");
+        headerRow.createCell(4).setCellValue("学院");
+        headerRow.createCell(5).setCellValue("专业");
+        headerRow.createCell(6).setCellValue("班级");
+        headerRow.createCell(7).setCellValue("性别");
+        headerRow.createCell(8).setCellValue("楼栋名称");
+        headerRow.createCell(9).setCellValue("寝室号");
+        headerRow.createCell(10).setCellValue("床位号");
+        headerRow.createCell(11).setCellValue("辅导员");
+
+        for (int i = 0; i < result.size(); i++) {
+            WelcomeBed bed = result.get(i);
+            Row dataRow = sheet.createRow(i + 1);
+            dataRow.createCell(0).setCellValue(i + 1);
+            dataRow.createCell(1).setCellValue(bed.getCardNum());
+            dataRow.createCell(2).setCellValue(bed.getName());
+            dataRow.createCell(3).setCellValue(bed.getSchool());
+            dataRow.createCell(4).setCellValue(bed.getCollege());
+            dataRow.createCell(5).setCellValue(bed.getMajor());
+            dataRow.createCell(6).setCellValue(bed.getClassstr());
+            dataRow.createCell(7).setCellValue(bed.getSex());
+            dataRow.createCell(8).setCellValue(bed.getBuild());
+            dataRow.createCell(9).setCellValue(bed.getDormitory());
+            dataRow.createCell(10).setCellValue(bed.getNumber());
+            dataRow.createCell(11).setCellValue(bed.getInstructor());
+        }
+        // 将工作簿写入文件
+        ExcelUtils.excelDownload(workbook, "学生住宿信息.xlsx", response);
+
     }
 }
 

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

@@ -103,8 +103,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             welcomeBed.setSex(welcomeDormitory.getSex());
             welcomeBed.setCollege(welcomeDormitory.getCollege());
             welcomeBed.setCollegeId(welcomeDormitory.getCollegeId());
-            welcomeBed.setMajor(welcomeDormitory.getMajor());
-            welcomeBed.setMajorId(welcomeDormitory.getMajorId());
+            welcomeBed.setGrade(welcomeDormitory.getGrade());
             welcomeBed.setIsCheck(0);
             welcomeBed.setRetentionState(1);
             welcomeBeds.add(welcomeBed);
@@ -232,9 +231,9 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
     @Override
-    public CommonResult listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId) {
+    public CommonResult listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId,Integer retentionState) {
 
-        PageUtils<WelcomeDormitoryVo> pageUtils = welcomeDormitoryService.listDormitory(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, status, majorId, collegeId);
+        PageUtils<WelcomeDormitoryVo> pageUtils = welcomeDormitoryService.listDormitory(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, status, majorId, collegeId,retentionState);
 
         if (pageUtils != null && pageUtils.getList() != null && pageUtils.getList().size() > 0) {
             List<Integer> dormitoryIds = pageUtils.getList().stream().map(WelcomeDormitoryVo::getId).collect(Collectors.toList());
@@ -372,9 +371,9 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         if (!sex.equals("寝室性别")) {
                             return CommonResult.fail("导入数据第五列为寝室性别");
                         }
-                        String major = dataFormatter.formatCellValue(row.getCell(5));//所属专业
-                        if (!major.equals("所属专业")) {
-                            return CommonResult.fail("导入数据第六列为所属专业");
+                        String grade = dataFormatter.formatCellValue(row.getCell(5));//所属年级
+                        if (!grade.equals("所属年级")) {
+                            return CommonResult.fail("导入数据第六列为所属年级");
                         }
                         String college = dataFormatter.formatCellValue(row.getCell(6));//所属学院
                         if (!college.equals("所属学院")) {
@@ -411,7 +410,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         }
 
                         String sex = dataFormatter.formatCellValue(row.getCell(4));//寝室性别
-                        String major = dataFormatter.formatCellValue(row.getCell(5));//所属专业
+                        String grade = dataFormatter.formatCellValue(row.getCell(5));//所属年级
                         String college = dataFormatter.formatCellValue(row.getCell(6));//所属学院
                         String bedNum = dataFormatter.formatCellValue(row.getCell(7));//床位数
                         String freeBedNumber = dataFormatter.formatCellValue(row.getCell(8));//空闲床位数
@@ -431,21 +430,22 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
                         Optional<WelcomeOrg> oCollege = orgs.stream().filter(e -> e.getName().equals(college)).findFirst();
                         if (oCollege != null && oCollege.isPresent()) {
-                            wd.setCollege(major);
+                            wd.setCollege(college);
                             wd.setCollegeId(oCollege.get().getId());
                         }
 
-                        Optional<WelcomeOrg> oMajor = orgs.stream().filter(e -> e.getName().equals(major)).findFirst();
-                        if (oMajor != null && oMajor.isPresent()) {
-                            wd.setMajor(major);
-                            wd.setMajorId(oMajor.get().getId());
-                        }
+//                        Optional<WelcomeOrg> oMajor = orgs.stream().filter(e -> e.getName().equals(major)).findFirst();
+//                        if (oMajor != null && oMajor.isPresent()) {
+//                            wd.setMajor(major);
+//                            wd.setMajorId(oMajor.get().getId());
+//                        }
 
                         wd.setBedNumber(Integer.valueOf(bedNum));
                         wd.setFreeBedNumber(Integer.valueOf(freeBedNumber));
                         wd.setStatus(Integer.valueOf(status));
                         wd.setRemark(remark);
                         wd.setRetentionState(Integer.valueOf(retentionState));
+                        wd.setGrade(Integer.valueOf(grade));
                         result.add(wd);
                     }
                 }
@@ -510,9 +510,9 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         if (!sex.equals("寝室性别")) {
                             return CommonResult.fail("导入数据第五列为寝室性别");
                         }
-                        String major = dataFormatter.formatCellValue(row.getCell(5));//所属专业
-                        if (!major.equals("所属专业")) {
-                            return CommonResult.fail("导入数据第六列为所属专业");
+                        String grade = dataFormatter.formatCellValue(row.getCell(5));//所属专业
+                        if (!grade.equals("所属年级")) {
+                            return CommonResult.fail("导入数据第六列为所属年级");
                         }
                         String college = dataFormatter.formatCellValue(row.getCell(6));//所属学院
                         if (!college.equals("所属学院")) {
@@ -550,7 +550,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         }
 
                         String sex = dataFormatter.formatCellValue(row.getCell(4));//寝室性别
-                        String major = dataFormatter.formatCellValue(row.getCell(5));//所属专业
+                        String grade = dataFormatter.formatCellValue(row.getCell(5));//所属年级
                         String college = dataFormatter.formatCellValue(row.getCell(6));//所属学院
                         String bedNum = dataFormatter.formatCellValue(row.getCell(7));//床位数
                         String freeBedNumber = dataFormatter.formatCellValue(row.getCell(8));//空闲床位数
@@ -570,22 +570,22 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
                         Optional<WelcomeOrg> oCollege = orgs.stream().filter(e -> e.getName().equals(college)).findFirst();
                         if (oCollege != null && oCollege.isPresent()) {
-                            wd.setCollege(major);
+                            wd.setCollege(college);
                             wd.setCollegeId(oCollege.get().getId());
                         }
 
-                        Optional<WelcomeOrg> oMajor = orgs.stream().filter(e -> e.getName().equals(major)).findFirst();
-                        if (oMajor != null && oMajor.isPresent()) {
-                            wd.setMajor(major);
-                            wd.setMajorId(oMajor.get().getId());
-                        }
+//                        Optional<WelcomeOrg> oMajor = orgs.stream().filter(e -> e.getName().equals(major)).findFirst();
+//                        if (oMajor != null && oMajor.isPresent()) {
+//                            wd.setMajor(major);
+//                            wd.setMajorId(oMajor.get().getId());
+//                        }
 
                         wd.setBedNumber(Integer.valueOf(bedNum));
                         wd.setFreeBedNumber(Integer.valueOf(freeBedNumber));
                         wd.setStatus(Integer.valueOf(status));
                         wd.setRemark(remark);
                         wd.setRetentionState(Integer.valueOf(retentionState));
-
+                        wd.setGrade(Integer.valueOf(grade));
                         result.add(wd);
                     }
                 }
@@ -615,7 +615,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         headerRow.createCell(2).setCellValue("楼栋名称");
         headerRow.createCell(3).setCellValue("寝室号");
         headerRow.createCell(4).setCellValue("寝室性别");
-        headerRow.createCell(5).setCellValue("所属专业");
+        headerRow.createCell(5).setCellValue("所属年级");
         headerRow.createCell(6).setCellValue("所属学院");
         headerRow.createCell(7).setCellValue("床位数");
         headerRow.createCell(8).setCellValue("空闲床位数");
@@ -630,7 +630,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             dataRow.createCell(2).setCellValue(build.getBuild());
             dataRow.createCell(3).setCellValue(build.getDormitory());
             dataRow.createCell(4).setCellValue(build.getSex());
-            dataRow.createCell(5).setCellValue(build.getMajor());
+            dataRow.createCell(5).setCellValue(build.getGrade());
             dataRow.createCell(6).setCellValue(build.getCollege());
             dataRow.createCell(7).setCellValue(build.getBedNumber());
             dataRow.createCell(8).setCellValue(build.getFreeBedNumber());

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

@@ -25,7 +25,7 @@ public interface WelcomeDormitoryMapper extends BaseMapper<WelcomeDormitory> {
 
     IPage<WelcomeDormitoryVo> listDormitory(Page<WelcomeDormitoryVo> page, @Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,
                                             @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("status") Integer status,
-                                            @Param("majorId") Integer majorId, @Param("collegeId") Integer collegeId);
+                                            @Param("majorId") Integer majorId, @Param("collegeId") Integer collegeId,@Param("retentionState") Integer retentionState);
 
 
     List<WelcomeDormitoryVo> listDormitory( @Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,

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

@@ -61,6 +61,9 @@ public class WelcomeBed implements Serializable {
     @ApiModelProperty(value = "床位性别")
     private String sex;
 
+    @ApiModelProperty(value = "所属年级")
+    private Integer grade;
+
     @ApiModelProperty(value = "所属学院")
     private String college;
 
@@ -88,7 +91,7 @@ public class WelcomeBed implements Serializable {
     @ApiModelProperty(value = "专业")
     private String major;
 
-    @ApiModelProperty(value = "保留状态 1:保留，0不保留")
+    @ApiModelProperty(value = "保留状态 1:开发，2保留")
     private Integer retentionState;
 
     @ApiModelProperty(value = "备注")

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

@@ -55,14 +55,11 @@ public class WelcomeDormitory implements Serializable {
     @ApiModelProperty(value = "所属学院")
     private String college;
 
-    @ApiModelProperty(value = "所属专业")
-    private String major;
-
     @ApiModelProperty(value = "所属学院ID")
     private Integer collegeId;
 
-    @ApiModelProperty(value = "所属专业ID")
-    private Integer majorId;
+    @ApiModelProperty(value = "所属年级")
+    private Integer grade;
 
     @ApiModelProperty(value = "床位数")
     private Integer bedNumber;
@@ -76,7 +73,7 @@ public class WelcomeDormitory implements Serializable {
     @ApiModelProperty(value = "空闲床位数")
     private Integer freeBedNumber;
 
-    @ApiModelProperty(value = "保留状态 1:保留，0不保留")
+    @ApiModelProperty(value = "保留状态 1:开发，2保留")
     private Integer retentionState;
 
     @ApiModelProperty(value = "创建时间")

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

@@ -74,4 +74,13 @@ public class InsertWelcomeBedRequest implements Serializable {
 
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "保留状态 1:开发，2保留")
+    private Integer retentionState;
+
+    @ApiModelProperty(value = "所属年级")
+    private Integer grade;
+
+    @ApiModelProperty(value = "辅导员")
+    private String instructor;
 }

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

@@ -74,4 +74,13 @@ public class UpdateWelcomeBedRequest implements Serializable {
 
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "保留状态 1:开发，2保留")
+    private Integer retentionState;
+
+    @ApiModelProperty(value = "所属年级")
+    private Integer grade;
+
+    @ApiModelProperty(value = "辅导员")
+    private String instructor;
 }

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

@@ -0,0 +1,17 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class ReplaceBedVo {
+
+    /**
+     * 源床位id
+     */
+    private Integer sourceBedId;
+
+    /**
+     * 交换的床位id
+     */
+    private Integer changeBedId;
+}

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

@@ -28,14 +28,11 @@ public class WelcomeDormitoryVo {
     @ApiModelProperty(value = "所属学院")
     private String college;
 
-    @ApiModelProperty(value = "所属专业")
-    private String major;
-
     @ApiModelProperty(value = "所属学院ID")
     private Integer collegeId;
 
-    @ApiModelProperty(value = "所属专业ID")
-    private Integer majorId;
+    @ApiModelProperty(value = "所属年级")
+    private Integer grade;
 
     @ApiModelProperty(value = "床位数")
     private Integer bedNumber;

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

@@ -22,7 +22,7 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     int updateWelcomeBed(WelcomeBed rns);
 
-    PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId);
+    PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState);
 
     int deleteWelcomeBedById(int id);
 
@@ -45,4 +45,10 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
     List<WelcomeBed> queryBeds(List<Integer> dormitoryIds);
 
     WelcomeBedCheckVo isCheck(String studentCard);
+
+    List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId);
+
+    PageUtils<WelcomeBed> studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name);
+
+    List<WelcomeBed> studentAccommodationList(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name);
 }

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

@@ -29,7 +29,7 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
     WelcomeDormitory getManageById(String id);
 
 
-    PageUtils<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId);
+    PageUtils<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId,Integer retentionState);
 
     List<WelcomeDormitoryVo> listDormitory(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId);
 

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

@@ -46,7 +46,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
+    public PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
@@ -57,6 +57,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(collegeId != null, "college_id", collegeId);
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
+        queryWrapper.eq(retentionState != null, "retention_state", retentionState);
         queryWrapper.orderByDesc("update_time");
         IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
@@ -142,7 +143,8 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> queryDormitorys(Integer dormitory) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("dormitory_id", dormitory);
+        queryWrapper.eq("dormitory_id", dormitory)
+                .eq("retention_state",1);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -161,4 +163,49 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         return result;
     }
 
+    @Override
+    public List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getDormitoryId, dormitoryId)
+                .eq(WelcomeBed::getIsCheck, 1)
+                .eq(WelcomeBed::getRetentionState,1);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public PageUtils<WelcomeBed> studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name) {
+        Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
+        QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(schoolId != null, "school_id", schoolId);
+        queryWrapper.eq(buildId != null, "build_id", buildId);
+        queryWrapper.eq(dormitoryId != null, "dormitory_id", dormitoryId);
+        queryWrapper.eq(collegeId != null, "college_id", collegeId);
+        queryWrapper.eq(majorId != null, "major_id", majorId);
+        queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
+        queryWrapper.like(name != null, "name", name);
+        queryWrapper.eq( "is_check", 1);
+        queryWrapper.orderByDesc("update_time");
+        IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
+        return new PageUtils<>(result);
+    }
+
+    @Override
+    public List<WelcomeBed> studentAccommodationList(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name) {
+        QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(schoolId != null, "school_id", schoolId);
+        queryWrapper.eq(buildId != null, "build_id", buildId);
+        queryWrapper.eq(dormitoryId != null, "dormitory_id", dormitoryId);
+        queryWrapper.eq(collegeId != null, "college_id", collegeId);
+        queryWrapper.eq(majorId != null, "major_id", majorId);
+        queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
+        queryWrapper.like(name != null, "name", name);
+        queryWrapper.eq( "is_check", 1);
+        queryWrapper.orderByDesc("update_time");
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
 }

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

@@ -68,9 +68,9 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
 
 
     @Override
-    public PageUtils<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId) {
+    public PageUtils<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId,Integer retentionState) {
         Page<WelcomeDormitoryVo> page = new Page<>(currentPage, pageCount);
-        IPage<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitory(page,schoolId,buildId,dormitoryId,sex,status,majorId,collegeId);
+        IPage<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitory(page,schoolId,buildId,dormitoryId,sex,status,majorId,collegeId,retentionState);
         return new PageUtils<>(result);
     }
 

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

@@ -25,6 +25,6 @@
         <if test="sex != null and sex != ''">
             and wb.sex = #{sex}
         </if>
-
+        order by wb.create_time desc
     </select>
 </mapper>

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

@@ -13,8 +13,7 @@
         wd.sex,
         wd.college_id as collegeId,
         wo.name as college,
-        wd.major_id as majorId,
-        wo2.name as major,
+        wd.grade as grade,
         wd.bed_number as bedNumber,
         wd.remark,
         wd.status,
@@ -25,7 +24,6 @@
         LEFT JOIN welcome_school ws ON wd.school_id = ws.id and ws.deleted = 0
         LEFT JOIN welcome_build wb ON wd.build_id = wb.id and wb.deleted = 0
         LEFT JOIN welcome_org wo ON wd.college_id = wo.id and wo.deleted = 0
-        LEFT JOIN welcome_org wo2 ON wd.major_id = wo2.id and wo2.deleted = 0
         WHERE
         wd.deleted =0
         <if test="schoolId != null and schoolId != ''">
@@ -49,6 +47,10 @@
         <if test="collegeId != null and collegeId != ''">
             and wd.college_id = #{collegeId}
         </if>
+        <if test="retentionState != null and retentionState != ''">
+            and wd.retention_state = #{retentionState}
+        </if>
+        order by wd.create_time desc
     </select>
     <select id="getTotalCount" resultType="com.template.model.vo.StudentStayVo">
         SELECT