更新

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

@@ -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

@@ -82,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())) {
@@ -362,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));//床位性别
@@ -546,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));//床位性别
@@ -1225,5 +1237,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

@@ -103,32 +103,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 +452,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 +584,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));//寝室性别
@@ -721,6 +721,17 @@ 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);
+
+        return CommonResult.ok(dormitories);
+    }
 }
 

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

@@ -81,4 +81,6 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
     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);
+
+
 }

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,6 @@ 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);
 }

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

@@ -382,6 +382,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         return new PageUtils<>(result);
     }
 
+
     @Override
     public List<WelcomeBed> collegeBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();

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,14 @@ 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;
+    }
 }