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

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

@@ -32,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,Integer retentionState);
+    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,Integer accountId);
 
     @GetMapping(value = "/deleteBedInfo")
     @ApiOperation(value = "删除床位信息", notes = "删除床位信息", httpMethod = "GET")
@@ -48,7 +48,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "welcomeBedExport")
     @ApiOperation(value = "导出床位信息数据", notes = "导出床位信息数据", httpMethod = "GET")
-    void welcomeBedExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState);
+    void welcomeBedExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState,Integer accountId);
 
     @PostMapping(value = "/submit")
     @ApiOperation(value = "提交床位信息", notes = "提交床位信息", httpMethod = "POST")
@@ -96,11 +96,11 @@ public interface WelcomeBedControllerAPI {
 
     @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);
+    CommonResult studentAccommodationPage(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,Integer majorId, Integer classstrId,String name,Integer accountId);
 
     @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);
+    void studentAccommodationListExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId,Integer majorId, Integer classstrId,String name,Integer accountId);
 
     @GetMapping(value = "/changeBuildGroup")
     @ApiOperation(value = "换床楼栋分组", notes = "学院寝室分组", httpMethod = "GET")

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

@@ -56,7 +56,7 @@ public interface WelcomeDormitoryControllerAPI {
 
     @GetMapping(value = "welcomeDormitoryExport")
     @ApiOperation(value = "导出寝室信息数据", notes = "导出寝室信息数据", httpMethod = "GET")
-    void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer collegeId,Integer status,Integer retentionState);
+    void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer collegeId,Integer status,Integer retentionState,Integer accountId);
 
     @PostMapping(value = "/batchOperation")
     @ApiOperation(value = "批量操作", notes = "批量操作", httpMethod = "POST")
@@ -66,5 +66,7 @@ public interface WelcomeDormitoryControllerAPI {
     @ApiOperation(value = "寝室和学院分组", notes = "寝室和学院分组", httpMethod = "GET")
     CommonResult collegeDormitoryCollegeGroup(Integer schoolId,Integer buildId,Integer collegeId);
 
-
+    @GetMapping(value = "/saveBedDormitoryGroup")
+    @ApiOperation(value = "添加床位楼栋分组", notes = "添加床位楼栋分组", httpMethod = "GET")
+    CommonResult saveBedDormitoryGroup(Integer schoolId,Integer accountId);
 }

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

@@ -69,6 +69,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     @Autowired
     private WelcomeSchoolService welcomeSchoolService;
 
+    @Autowired
+    private WelcomeAccountService welcomeAccountService;
+
     @Override
     public CommonResult insertBedInfo(InsertWelcomeBedRequest iwbr, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -79,16 +82,28 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (ObjectUtils.isEmpty(byId)) {
             return CommonResult.fail("该宿舍号不存在");
         }
+
         if (!byId.getSex().equals(iwbr.getSex())) {
             return CommonResult.fail("请勿跨性别添加床位");
         }
+        Integer bedNumber = byId.getBedNumber();
+//        查询该寝室下有多少床位
+        LambdaQueryWrapper<WelcomeBed> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeBed::getDormitoryId,iwbr.getDormitoryId());
+        List<WelcomeBed> list = welcomeBedService.list(wrapper);
 
+        if (list.size()>=bedNumber) {
+            return CommonResult.fail("该寝室的床位号已满");
+        }
 
         WelcomeBed existData = welcomeBedService.queryBedData(iwbr.getSchool(), iwbr.getBuildId(), iwbr.getDormitoryId(), iwbr.getNumber());
         if (existData != null) {
             return CommonResult.fail("该床位号已存在，请勿重复插入！");
         }
 
+
+
+
         WelcomeBed wb = new WelcomeBed();
 
         if (StringUtils.hasText(iwbr.getCardNum())) {
@@ -196,8 +211,21 @@ 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,Integer retentionState) {
-        PageUtils<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId,retentionState);
+    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,Integer accountId) {
+        //        当学院为空
+        PageUtils<WelcomeBed> result=null;
+        if (ObjectUtils.isEmpty(collegeId)) {
+            String collegeIds = "";
+            WelcomeAccount account = welcomeAccountService.getById(accountId);
+            if (ObjectUtils.isEmpty(account)) {
+                return CommonResult.fail("当前账号不存在,请重新登入");
+            }
+            collegeIds = account.getCollegeId();
+            result = welcomeBedService.queryPageWelcomeBedsC(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeIds, majorId, classstrId,retentionState);
+        }else {
+           result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId,retentionState);
+        }
+
         return CommonResult.ok(result);
     }
 
@@ -346,7 +374,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         Optional<WelcomeBed> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)
                                 && e.getDormitory().equals(dormitory) && e.getNumber().intValue() == Integer.valueOf(number).intValue()).findFirst();
                         if (ob != null && ob.isPresent()) {
-                            return CommonResult.fail("第"+rowNum+1+"行,已存在该床位");
+                            bedData.setId(ob.get().getId());
                         }
 
                         String sex = dataFormatter.formatCellValue(row.getCell(4));//床位性别
@@ -530,7 +558,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         Optional<WelcomeBed> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)
                                 && e.getDormitory().equals(dormitory) && e.getNumber().intValue() == Integer.valueOf(number).intValue()).findFirst();
                         if (ob != null && ob.isPresent()) {
-                            return CommonResult.fail("第"+rowNum+1+"行,已存在该床位");
+                            bedData.setId(ob.get().getId());
                         }
 
                         String sex = dataFormatter.formatCellValue(row.getCell(4));//床位性别
@@ -633,8 +661,22 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public void welcomeBedExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState) {
-        List<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId,retentionState);
+    public void welcomeBedExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState,Integer accountId) {
+        //        当学院为空
+        List<WelcomeBed> result=null;
+        if (ObjectUtils.isEmpty(collegeId)) {
+            String collegeIds = "";
+            WelcomeAccount account = welcomeAccountService.getById(accountId);
+            if (ObjectUtils.isEmpty(account)) {
+                throw new RuntimeException("当前账号不存在,请重新登入");
+            }
+            collegeIds = account.getCollegeId();
+            result = welcomeBedService.queryPageWelcomeBedsS(schoolId, buildId, dormitoryId, sex, isCheck, collegeIds, majorId, classstrId,retentionState);
+        }else {
+            result = welcomeBedService.queryPageWelcomeBeds(schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId,retentionState);
+        }
+
+
 
         //导出
         Workbook workbook = new XSSFWorkbook();
@@ -1027,14 +1069,39 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @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);
+    public CommonResult studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name,Integer accountId) {
+        //        当学院为空
+        PageUtils<WelcomeBed> result=null;
+        if (ObjectUtils.isEmpty(collegeId)) {
+            String collegeIds = "";
+            WelcomeAccount account = welcomeAccountService.getById(accountId);
+            if (ObjectUtils.isEmpty(account)) {
+                return CommonResult.fail("当前账号不存在,请重新登入");
+            }
+            collegeIds = account.getCollegeId();
+            result = welcomeBedService.studentAccommodationPageS(currentPage, pageCount, schoolId, buildId, dormitoryId,collegeIds, majorId, classstrId,name);
+        }else {
+            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);
+    public void studentAccommodationListExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name,Integer accountId) {
+        //        当学院为空
+        List<WelcomeBed> result=null;
+        if (ObjectUtils.isEmpty(collegeId)) {
+            String collegeIds = "";
+            WelcomeAccount account = welcomeAccountService.getById(accountId);
+            if (ObjectUtils.isEmpty(account)) {
+                throw new RuntimeException("当前账号不存在,请重新登入");
+            }
+            collegeIds = account.getCollegeId();
+            result =welcomeBedService.studentAccommodationListS( schoolId, buildId, dormitoryId,collegeIds, majorId, classstrId,name);
+        }else {
+            result = welcomeBedService.studentAccommodationList( schoolId, buildId, dormitoryId,collegeId, majorId, classstrId,name);
+        }
+
 
         //导出
         Workbook workbook = new XSSFWorkbook();
@@ -1209,5 +1276,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
 
+
+
 }
 

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

@@ -231,7 +231,7 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
                         String build = dataFormatter.formatCellValue(row.getCell(2));//楼栋名称
                         Optional<WelcomeBuild> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
                         if (ob != null && ob.isPresent()) {
-                            return CommonResult.fail("第"+rowNum+1+"行,已存在该楼栋");
+                           buildData.setId(ob.get().getId());
                         }
 
                         buildData.setSchool(school);
@@ -329,7 +329,7 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
                         String build = dataFormatter.formatCellValue(row.getCell(2));//楼栋名称
                         Optional<WelcomeBuild> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
                         if (ob != null && ob.isPresent()) {
-                            return CommonResult.fail("第"+rowNum+1+"行,已存在该楼栋");
+                            buildData.setId(ob.get().getId());
                         }
 
                         buildData.setSchool(school);

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

@@ -13,6 +13,8 @@ import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.BatchOperationVo;
+import com.template.model.vo.ChangeBuildGroupVo;
+import com.template.model.vo.SaveBedDormitoryGroupVo;
 import com.template.model.vo.WelcomeDormitoryVo;
 import com.template.services.*;
 import org.apache.poi.hssf.record.chart.FontIndexRecord;
@@ -83,7 +85,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         }
 
         WelcomeDormitory existCount = welcomeDormitoryService.queryExistDormotory(welcomeDormitory.getSchoolId(), welcomeDormitory.getBuildId(), welcomeDormitory.getDormitory());
-        if (existCount != null && existCount.getId().intValue() != welcomeDormitory.getId().intValue()) {
+        if (existCount != null) {
             return CommonResult.ok("当前寝室号已存在");
         }
 
@@ -103,32 +105,32 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         }
 
         //动态生成床位
-        Integer bedNumber = welcomeDormitory.getBedNumber();
-        ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
-        for (int i = 1; i <= bedNumber; i++) {
-            WelcomeBed welcomeBed = new WelcomeBed();
-            welcomeBed.setNumber(i);
-            welcomeBed.setSchool(welcomeDormitory.getSchool());
-            welcomeBed.setSchoolId(welcomeDormitory.getSchoolId());
-            welcomeBed.setBuild(welcomeDormitory.getBuild());
-            welcomeBed.setBuildId(welcomeDormitory.getBuildId());
-            welcomeBed.setDormitory(welcomeDormitory.getDormitory());
-            welcomeBed.setDormitoryId(welcomeDormitory.getId());
-            welcomeBed.setSex(welcomeDormitory.getSex());
-            welcomeBed.setCollege(welcomeDormitory.getCollege());
-            welcomeBed.setCollegeId(welcomeDormitory.getCollegeId());
-            welcomeBed.setGrade(welcomeDormitory.getGrade());
-            welcomeBed.setIsCheck(0);
-            welcomeBed.setRetentionState(welcomeDormitory.getRetentionState());
-            welcomeBeds.add(welcomeBed);
-        }
-
-        if (welcomeBeds != null && welcomeBeds.size() > 0) {
-            boolean insertBeds = welcomeBedService.saveBatch(welcomeBeds);
-            if (!insertBeds) {
-                return CommonResult.fail("新增失败");
-            }
-        }
+//        Integer bedNumber = welcomeDormitory.getBedNumber();
+//        ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
+//        for (int i = 1; i <= bedNumber; i++) {
+//            WelcomeBed welcomeBed = new WelcomeBed();
+//            welcomeBed.setNumber(i);
+//            welcomeBed.setSchool(welcomeDormitory.getSchool());
+//            welcomeBed.setSchoolId(welcomeDormitory.getSchoolId());
+//            welcomeBed.setBuild(welcomeDormitory.getBuild());
+//            welcomeBed.setBuildId(welcomeDormitory.getBuildId());
+//            welcomeBed.setDormitory(welcomeDormitory.getDormitory());
+//            welcomeBed.setDormitoryId(welcomeDormitory.getId());
+//            welcomeBed.setSex(welcomeDormitory.getSex());
+//            welcomeBed.setCollege(welcomeDormitory.getCollege());
+//            welcomeBed.setCollegeId(welcomeDormitory.getCollegeId());
+//            welcomeBed.setGrade(welcomeDormitory.getGrade());
+//            welcomeBed.setIsCheck(0);
+//            welcomeBed.setRetentionState(welcomeDormitory.getRetentionState());
+//            welcomeBeds.add(welcomeBed);
+//        }
+
+//        if (welcomeBeds != null && welcomeBeds.size() > 0) {
+//            boolean insertBeds = welcomeBedService.saveBatch(welcomeBeds);
+//            if (!insertBeds) {
+//                return CommonResult.fail("新增失败");
+//            }
+//        }
 
         return CommonResult.ok();
     }
@@ -452,7 +454,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         WelcomeDormitory wd = new WelcomeDormitory();
                         Optional<WelcomeDormitory> owelcomeDormitory = wds.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build) && e.getDormitory().equals(dormitory)).findFirst();
                         if (owelcomeDormitory != null && owelcomeDormitory.isPresent()) {
-                            return CommonResult.fail("第"+rowNum+1+"行,已存在该宿舍");
+                            wd.setId(owelcomeDormitory.get().getId());
                         }
 
                         String sex = dataFormatter.formatCellValue(row.getCell(3));//寝室性别
@@ -584,7 +586,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         WelcomeDormitory wd = new WelcomeDormitory();
                         Optional<WelcomeDormitory> owelcomeDormitory = wds.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build) && e.getDormitory().equals(dormitory)).findFirst();
                         if (owelcomeDormitory != null && owelcomeDormitory.isPresent()) {
-                            return CommonResult.fail("第"+rowNum+1+"行,已存在该宿舍");
+                            wd.setId(owelcomeDormitory.get().getId());
                         }
 
                         String sex = dataFormatter.formatCellValue(row.getCell(3));//寝室性别
@@ -646,8 +648,21 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
     @Override
-    public void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState) {
-        List<WelcomeDormitoryVo> result = welcomeDormitoryService.listDormitory(schoolId, buildId, dormitoryId, sex, collegeId, status, retentionState);
+    public void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer collegeId, Integer status, Integer retentionState,Integer accountId) {
+        //        当学院为空
+        List<WelcomeDormitoryVo> result=null;
+        if (ObjectUtils.isEmpty(collegeId)) {
+            String collegeIds="";
+            WelcomeAccount account = welcomeAccountService.getById(accountId);
+            if (ObjectUtils.isEmpty(account)) {
+                throw new RuntimeException("当前账号已被删除,请重新登入");
+            }
+            collegeIds=account.getCollegeId();
+            result = welcomeDormitoryService.listDormitoryS(schoolId, buildId, dormitoryId, sex, collegeIds, status, retentionState);
+        }else {
+            result = welcomeDormitoryService.listDormitory(schoolId, buildId, dormitoryId, sex, collegeId, status, retentionState);
+        }
+
         //导出
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("宿舍信息");
@@ -721,6 +736,23 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         return CommonResult.ok(list);
     }
 
+    @Override
+    public CommonResult saveBedDormitoryGroup(Integer schoolId, Integer accountId) {
 
+        WelcomeAccount account = welcomeAccountService.getById(accountId);
+        if (ObjectUtils.isEmpty(account)) {
+            return CommonResult.fail("无该账号权限");
+        }
+        String collegeIds = account.getCollegeId();
+        List<WelcomeDormitory> dormitories = welcomeDormitoryService.saveBedDormitoryGroup(schoolId,collegeIds);
+        ArrayList<SaveBedDormitoryGroupVo> vos = new ArrayList<>();
+        for (WelcomeDormitory welcomeDormitory : dormitories) {
+            SaveBedDormitoryGroupVo vo = new SaveBedDormitoryGroupVo();
+            vo.setBuild(welcomeDormitory.getBuild());
+            vo.setId(welcomeDormitory.getBuildId());
+            vos.add(vo);
+        }
+        return CommonResult.ok(vos);
+    }
 }
 

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

@@ -38,4 +38,8 @@ public interface WelcomeDormitoryMapper extends BaseMapper<WelcomeDormitory> {
                                                 @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("collegeIds") String collegeIds,
                                                 @Param("status") Integer status,@Param("retentionState") Integer retentionState);
 
+    List<WelcomeDormitoryVo> listDormitoryS(@Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,
+                                            @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("collegeIds") String collegeIds,
+                                            @Param("status") Integer status,@Param("retentionState") Integer retentionState);
+
 }

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

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

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

@@ -79,4 +79,13 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
     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);
+
+    PageUtils<WelcomeBed> queryPageWelcomeBedsC(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState);
+
+
+    List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState);
+
+    PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String collegeIds, Integer majorId, Integer classstrId, String name);
+
+    List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, String collegeIds, Integer majorId, Integer classstrId, String name);
 }

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

@@ -1,5 +1,6 @@
 package com.template.services;
 
+import com.template.model.pojo.WelcomeBed;
 import com.template.model.pojo.WelcomeDormitory;
 import com.template.model.pojo.WelcomeDormitory;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -41,4 +42,9 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
     WelcomeDormitory queryExistDormotory(Integer schoolId, Integer buildId, String dormitory);
 
     PageUtils<WelcomeDormitoryVo> listDormitoryCPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState);
+
+    List<WelcomeDormitory> saveBedDormitoryGroup(Integer schoolId, String collegeIds);
+
+    List<WelcomeDormitoryVo> listDormitoryS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState);
+
 }

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

@@ -365,6 +365,74 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
+    public PageUtils<WelcomeBed> queryPageWelcomeBedsC(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, 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);
+        queryWrapper.eq(buildId != null, "build_id", buildId);
+        queryWrapper.eq(dormitoryId != null, "dormitory_id", dormitoryId);
+        queryWrapper.eq(StringUtils.hasText(sex), "sex", sex);
+        queryWrapper.eq(isCheck != null, "is_check", isCheck);
+        queryWrapper.in( "college_id", collegeIds);
+        queryWrapper.eq(majorId != null, "major_id", majorId);
+        queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
+        queryWrapper.eq(retentionState != null, "retention_state", retentionState);
+        queryWrapper.orderByDesc("create_time");
+        IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
+        return new PageUtils<>(result);
+    }
+
+    @Override
+    public List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState) {
+        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(StringUtils.hasText(sex), "sex", sex);
+        queryWrapper.eq(isCheck != null, "is_check", isCheck);
+        queryWrapper.in( "college_id", collegeIds);
+        queryWrapper.eq(majorId != null, "major_id", majorId);
+        queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
+        queryWrapper.eq(retentionState != null, "retention_state", retentionState);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String collegeIds, 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.in("college_id", collegeIds);
+        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("create_time");
+        IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
+        return new PageUtils<>(result);
+    }
+
+    @Override
+    public List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, String collegeIds, 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.in( "college_id", collegeIds);
+        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("create_time");
+        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<>();
         queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)

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

@@ -1,11 +1,13 @@
 package com.template.services.impl;
 
+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.plugins.pagination.Page;
 import com.template.mapper.WelcomeDormitoryMapper;
+import com.template.model.pojo.WelcomeBed;
 import com.template.model.pojo.WelcomeDormitory;
 import com.template.model.pojo.WelcomeDormitory;
 import com.template.mapper.WelcomeDormitoryMapper;
@@ -123,4 +125,20 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         IPage<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitoryCPage(page,schoolId,buildId,dormitoryId,sex,collegeIds,status,retentionState);
         return new PageUtils<>(result);
     }
+
+    @Override
+    public List<WelcomeDormitory> saveBedDormitoryGroup(Integer schoolId, String collegeIds) {
+        LambdaQueryWrapper<WelcomeDormitory> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeDormitory::getSchoolId,schoolId)
+                .in(WelcomeDormitory::getCollegeId,collegeIds)
+                .groupBy(WelcomeDormitory::getSchoolId,WelcomeDormitory::getBuildId);
+        List<WelcomeDormitory> result = welcomeDormitoryMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<WelcomeDormitoryVo> listDormitoryS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState) {
+        List<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitoryS(schoolId,buildId,dormitoryId,sex,collegeIds,status,retentionState);
+        return result;
+    }
 }

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

@@ -155,4 +155,49 @@
         AND FIND_IN_SET(wd.college_id,#{collegeIds})
         order by wd.create_time desc
     </select>
+    <select id="listDormitoryS" resultType="com.template.model.vo.WelcomeDormitoryVo">
+        SELECT
+        wd.id,
+        wd.school_id as schoolId,
+        ws.school,
+        wd.build_id as buildId,
+        wb.build,
+        wd.dormitory,
+        wd.sex,
+        wd.college_id as collegeId,
+        wo.name as college,
+        wd.grade as grade,
+        wd.bed_number as bedNumber,
+        wd.remark,
+        wd.status,
+        wd.free_bed_number as freeBedNumber,
+        wd.retention_state as retentionState
+        FROM
+        `welcome_dormitory` wd
+        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
+        WHERE
+        wd.deleted =0
+        <if test="schoolId != null and schoolId != ''">
+            and wd.school_id = #{schoolId}
+        </if>
+        <if test="buildId != null and buildId != ''">
+            and wd.build_id = #{buildId}
+        </if>
+        <if test="dormitoryId != null and dormitoryId != ''">
+            and wd.id = #{dormitoryId}
+        </if>
+        <if test="sex != null and sex != ''">
+            and wd.sex = #{sex}
+        </if>
+        <if test="status != null and status != ''">
+            and wd.status = #{status}
+        </if>
+        <if test="retentionState != null and retentionState != ''">
+            and wd.retention_state = #{retentionState}
+        </if>
+        and FIND_IN_SET(wd.college_id ,#{collegeIds})
+        order by wd.create_time desc
+    </select>
 </mapper>