添加床位寝室分组

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

@@ -66,11 +66,15 @@ public interface WelcomeDormitoryControllerAPI {
     @ApiOperation(value = "寝室和学院分组", notes = "寝室和学院分组", httpMethod = "GET")
     CommonResult collegeDormitoryCollegeGroup(Integer schoolId,Integer buildId,Integer collegeId);
 
-    @GetMapping(value = "/saveBedDormitoryGroup")
+    @GetMapping(value = "/saveBedBuildGroup")
     @ApiOperation(value = "添加床位楼栋分组", notes = "添加床位楼栋分组", httpMethod = "GET")
-    CommonResult saveBedDormitoryGroup(Integer schoolId,Integer accountId);
+    CommonResult saveBedBuildGroup(Integer schoolId,Integer accountId);
 
     @GetMapping(value = "/dormitoryTGroup")
     @ApiOperation(value = "寝室分组", notes = "寝室分组", httpMethod = "GET")
     CommonResult dormitoryTGroup(Integer schoolId,Integer buildId);
+
+    @GetMapping(value = "/saveBedDormitoryGroup")
+    @ApiOperation(value = "添加床位宿舍分组", notes = "添加床位宿舍分组", httpMethod = "GET")
+    CommonResult saveBedDormitoryGroup(Integer schoolId,Integer buildId,Integer accountId);
 }

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

@@ -13,8 +13,7 @@ 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.SaveBedBuildGroupVo;
 import com.template.model.vo.WelcomeDormitoryVo;
 import com.template.services.*;
 import org.apache.poi.hssf.record.chart.FontIndexRecord;
@@ -745,7 +744,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
     @Override
-    public CommonResult saveBedDormitoryGroup(Integer schoolId, Integer accountId) {
+    public CommonResult saveBedBuildGroup(Integer schoolId, Integer accountId) {
 
         WelcomeAccount account = welcomeAccountService.getById(accountId);
         if (ObjectUtils.isEmpty(account)) {
@@ -758,10 +757,10 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         for (String s : split) {
             collegeIds.add(s);
         }
-        List<WelcomeDormitory> dormitories = welcomeDormitoryService.saveBedDormitoryGroup(schoolId,collegeIds);
-        ArrayList<SaveBedDormitoryGroupVo> vos = new ArrayList<>();
+        List<WelcomeDormitory> dormitories = welcomeDormitoryService.saveBedBuildGroup(schoolId,collegeIds);
+        ArrayList<SaveBedBuildGroupVo> vos = new ArrayList<>();
         for (WelcomeDormitory welcomeDormitory : dormitories) {
-            SaveBedDormitoryGroupVo vo = new SaveBedDormitoryGroupVo();
+            SaveBedBuildGroupVo vo = new SaveBedBuildGroupVo();
             vo.setBuild(welcomeDormitory.getBuild());
             vo.setId(welcomeDormitory.getBuildId());
             vos.add(vo);
@@ -775,5 +774,23 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
         return CommonResult.ok(list);
     }
+
+    @Override
+    public CommonResult saveBedDormitoryGroup(Integer schoolId, Integer buildId,Integer accountId) {
+        WelcomeAccount account = welcomeAccountService.getById(accountId);
+        if (ObjectUtils.isEmpty(account)) {
+            return CommonResult.fail("无该账号权限");
+        }
+        String aClassstrId = account.getCollegeId();
+        String[] split = aClassstrId.split(",");
+        List<String> collegeIds = new ArrayList<>();
+
+        for (String s : split) {
+            collegeIds.add(s);
+        }
+        List<WelcomeDormitory> dormitories = welcomeDormitoryService.saveBedDormitoryGroup(schoolId,buildId,collegeIds);
+
+        return CommonResult.ok(dormitories);
+    }
 }
 

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

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

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

@@ -43,9 +43,11 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
 
     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, List<String> collegeIds);
+    List<WelcomeDormitory> saveBedBuildGroup(Integer schoolId, List<String> collegeIds);
 
     List<WelcomeDormitoryVo> listDormitoryS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState);
 
     List<WelcomeDormitory> dormitoryTGroup(Integer schoolId, Integer buildId);
+
+    List<WelcomeDormitory> saveBedDormitoryGroup(Integer schoolId, Integer buildId, List<String> collegeIds);
 }

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

@@ -127,7 +127,7 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
     }
 
     @Override
-    public List<WelcomeDormitory> saveBedDormitoryGroup(Integer schoolId, List<String> collegeIds) {
+    public List<WelcomeDormitory> saveBedBuildGroup(Integer schoolId, List<String> collegeIds) {
         LambdaQueryWrapper<WelcomeDormitory> queryWrapper=new LambdaQueryWrapper<>();
         queryWrapper.eq(WelcomeDormitory::getSchoolId,schoolId)
                 .in(WelcomeDormitory::getCollegeId,collegeIds)
@@ -150,4 +150,15 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         List<WelcomeDormitory> welcomeDormitories = welcomeDormitoryMapper.selectList(wrapper);
         return welcomeDormitories;
     }
+
+    @Override
+    public List<WelcomeDormitory> saveBedDormitoryGroup(Integer schoolId, Integer buildId, List<String> collegeIds) {
+        LambdaQueryWrapper<WelcomeDormitory> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(WelcomeDormitory::getSchoolId,schoolId)
+                .eq(WelcomeDormitory::getBuildId,buildId)
+                .in(WelcomeDormitory::getCollegeId,collegeIds)
+                .groupBy(WelcomeDormitory::getSchoolId,WelcomeDormitory::getBuildId,WelcomeDormitory::getDormitory);
+        List<WelcomeDormitory> result = welcomeDormitoryMapper.selectList(queryWrapper);
+        return result;
+    }
 }