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

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

@@ -78,13 +78,17 @@ public interface WelcomeBedControllerAPI {
     @ApiOperation(value = "退宿", notes = "退宿", httpMethod = "GET")
     CommonResult checkOutDormitory(@RequestParam Integer bedId);
 
+    @GetMapping(value = "/bedGroup")
+    @ApiOperation(value = "根据学院分组", notes = "根据学院分组", httpMethod = "GET")
+    CommonResult bedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer collegeId);
+
     @PostMapping(value = "/changeBed")
     @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,Integer bedId);
+    CommonResult checkInBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer bedId,Integer collegeId);
 
     @PostMapping(value = "/replaceBed")
     @ApiOperation(value = "床位对调", notes = "床位对调", httpMethod = "POST")
@@ -98,4 +102,8 @@ 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);
+
 }

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

@@ -62,4 +62,9 @@ public interface WelcomeDormitoryControllerAPI {
     @ApiOperation(value = "批量操作", notes = "批量操作", httpMethod = "POST")
     CommonResult batchOperation(@RequestBody BatchOperationVo batchOperationVo);
 
+    @GetMapping(value = "/collegeDormitoryCollegeGroup")
+    @ApiOperation(value = "寝室和学院分组", notes = "寝室和学院分组", httpMethod = "GET")
+    CommonResult collegeDormitoryCollegeGroup(Integer schoolId,Integer buildId,Integer collegeId);
+
+
 }

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

@@ -668,6 +668,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         }
 
         WelcomeBed wb = welcomeBedService.getBedById(welcomeBed.getId());
+
         if (wb == null) {
             return CommonResult.fail("床位已失效，选择失败！");
         }
@@ -766,6 +767,11 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (bed.getIsCheck()==1) {
             return CommonResult.fail("该床位已被其他人入住");
         }
+        if (!welcomeStudent.getCollegeId().equals(bed.getCollegeId())) {
+            return CommonResult.fail("请勿跨学院入住");
+        }
+
+
 
         bed.setIsCheck(1);
         bed.setStudentCard(welcomeStudent.getCardId());
@@ -823,6 +829,11 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
+    public CommonResult bedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId) {
+        return null;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public CommonResult changeBed(ChangeBedVo changeBedVo) {
         Integer sourceBedId = changeBedVo.getSourceBedId();
@@ -832,6 +843,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (ObjectUtils.isEmpty(sourceBed) || ObjectUtils.isEmpty(changeBed)) {
             return CommonResult.fail("床位不存在");
         }
+        if (!sourceBed.getCollegeId().equals(changeBed.getCollegeId())) {
+            return CommonResult.fail("学院不同无法换床");
+        }
 
         changeBed.setIsCheck(1);
         changeBed.setStudentCard(sourceBed.getStudentCard());
@@ -883,9 +897,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public CommonResult checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId) {
+    public CommonResult checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId,Integer collegeId) {
         //        获取已入住的床位
-        List<WelcomeBed> beds = welcomeBedService.checkInBedGroup(schoolId, buildId, dormitoryId,bedId);
+        List<WelcomeBed> beds = welcomeBedService.checkInBedGroup(schoolId, buildId, dormitoryId,bedId,collegeId);
 
         return CommonResult.ok(beds);
     }
@@ -899,6 +913,11 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (ObjectUtils.isEmpty(sourceBed) || ObjectUtils.isEmpty(changeBed)) {
             return CommonResult.fail("床位不存在");
         }
+
+        if (!sourceBed.getCollegeId().equals(changeBed.getCollegeId())) {
+            return CommonResult.fail("学院不同无法床位对调");
+        }
+
 //        源数据
         WelcomeBed welcomeBed = new WelcomeBed();
         BeanUtil.copyProperties(sourceBed,welcomeBed);
@@ -999,5 +1018,13 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         ExcelUtils.excelDownload(workbook, "学生住宿信息.xlsx", response);
 
     }
+
+    @Override
+    public CommonResult collegeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId) {
+        //        获取未入住的床位
+        List<WelcomeBed> beds = welcomeBedService.collegeBedGroup(schoolId, buildId, dormitoryId,collegeId);
+
+        return CommonResult.ok(beds);
+    }
 }
 

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

@@ -413,5 +413,6 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
         ExcelUtils.excelDownload(workbook, "楼栋信息.xlsx", response);
     }
 
+
 }
 

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

@@ -656,5 +656,14 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         return CommonResult.ok();
     }
 
+    @Override
+    public CommonResult collegeDormitoryCollegeGroup(Integer schoolId, Integer buildId, Integer collegeId) {
+        List<WelcomeDormitory> list = welcomeDormitoryService.collegeDormitoryCollegeGroup(schoolId, buildId,collegeId);
+
+        return CommonResult.ok(list);
+    }
+
+
+
 }
 

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

@@ -48,7 +48,7 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     WelcomeBedCheckVo isCheck(String studentCard);
 
-    List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId);
+    List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId,Integer collegeId);
 
     PageUtils<WelcomeBed> studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name);
 
@@ -59,4 +59,6 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
     List<SleepSqlTotalVo> queryTotalSqlList(Integer collegeId, String sex);
 
     void updateData(Integer bedId);
+
+    List<WelcomeBed> collegeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId);
 }

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

@@ -36,4 +36,6 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
     List<WelcomeDormitory> dormitoryGroup(Integer schoolId, Integer buildId);
 
     StudentStayVo getTotalCount(Integer buildId);
+
+    List<WelcomeDormitory> collegeDormitoryCollegeGroup(Integer schoolId, Integer buildId, Integer collegeId);
 }

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

@@ -166,11 +166,12 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId) {
+    public List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId,Integer collegeId) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
                 .eq(WelcomeBed::getBuildId, buildId)
                 .eq(WelcomeBed::getDormitoryId, dormitoryId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
                 .eq(WelcomeBed::getIsCheck, 1)
                 .eq(WelcomeBed::getRetentionState,1)
                 .ne(WelcomeBed::getId,bedId);
@@ -223,8 +224,22 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         return result;
     }
 
+    @Override
     public void updateData(Integer bedId) {
         welcomeBedMapper.updateData(bedId);
     }
 
+    @Override
+    public List<WelcomeBed> collegeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId) {
+        LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId)
+                .eq(WelcomeBed::getDormitoryId, dormitoryId)
+                .eq(WelcomeBed::getCollegeId,collegeId)
+                .eq(WelcomeBed::getIsCheck, 0)
+                .eq(WelcomeBed::getRetentionState,1);
+        List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
+        return result;
+    }
+
 }

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

@@ -95,4 +95,15 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
     public StudentStayVo getTotalCount(Integer buildId) {
         return welcomeDormitoryMapper.getTotalCount(buildId);
     }
+
+    @Override
+    public List<WelcomeDormitory> collegeDormitoryCollegeGroup(Integer schoolId, Integer buildId, Integer collegeId) {
+        LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotEmpty(schoolId), WelcomeDormitory::getSchoolId, schoolId)
+                .eq(ObjectUtils.isNotEmpty(buildId), WelcomeDormitory::getBuildId, buildId)
+                .eq(WelcomeDormitory::getCollegeId,collegeId)
+                .eq(WelcomeDormitory::getRetentionState,1);
+        List<WelcomeDormitory> welcomeDormitories = welcomeDormitoryMapper.selectList(wrapper);
+        return welcomeDormitories;
+    }
 }