Browse Source

更新删除楼栋接口

liu 11 months ago
parent
commit
87117856e4
1 changed files with 23 additions and 11 deletions
  1. 23 11
      src/main/java/com/template/controller/WelcomeBuildController.java

+ 23 - 11
src/main/java/com/template/controller/WelcomeBuildController.java

@@ -81,6 +81,18 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
 
     @Override
     public CommonResult deleteBuild(Integer buildId) {
+//        需同步删除寝室和床位
+        WelcomeBuild byId = welcomeBuildService.getById(buildId);
+        String schoolId = byId.getSchoolId();
+        LambdaQueryWrapper<WelcomeBed> wrapperBed = new LambdaQueryWrapper<>();
+        wrapperBed.eq(WelcomeBed::getSchoolId, schoolId)
+                .eq(WelcomeBed::getBuildId, buildId);
+        welcomeBedService.remove(wrapperBed);
+
+        LambdaQueryWrapper<WelcomeDormitory> wrapperDormitory=new LambdaQueryWrapper<>();
+        wrapperDormitory.eq(WelcomeDormitory::getSchoolId,schoolId)
+                        .eq(WelcomeDormitory::getBuildId,buildId);
+        welcomeDormitoryService.remove(wrapperDormitory);
 
         boolean result = welcomeBuildService.removeById(buildId);
 
@@ -108,8 +120,8 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
         WelcomeBuild byId = welcomeBuildService.getById(welcomeBuild.getId());
         if (ObjectUtils.isNotEmpty(byId)) {
             if (!byId.getBuild().equals(welcomeBuild.getBuild())) {
-                welcomeDormitoryService.updateBuild(welcomeBuild.getSchoolId(),byId.getId(),welcomeBuild.getBuild());
-                welcomeBedService.updateBuild(welcomeBuild.getSchoolId(),byId.getId(),welcomeBuild.getBuild());
+                welcomeDormitoryService.updateBuild(welcomeBuild.getSchoolId(), byId.getId(), welcomeBuild.getBuild());
+                welcomeBedService.updateBuild(welcomeBuild.getSchoolId(), byId.getId(), welcomeBuild.getBuild());
             }
         }
 
@@ -255,15 +267,15 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
                         }
                         Optional<WelcomeSchool> wos = ws.stream().filter(e -> e.getSchool().equals(school)).findFirst();
                         if (wos != null && wos.isPresent()) {
-                            buildData.setSchoolId(wos.get().getId()+"");
-                        }else {
-                            int h=rowNum+1;
-                            return CommonResult.fail("第"+h+"行,不存在该校区");
+                            buildData.setSchoolId(wos.get().getId() + "");
+                        } else {
+                            int h = rowNum + 1;
+                            return CommonResult.fail("第" + h + "行,不存在该校区");
                         }
                         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()) {
-                           buildData.setId(ob.get().getId());
+                            buildData.setId(ob.get().getId());
                         }
 
                         buildData.setSchool(school);
@@ -358,10 +370,10 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
                         }
                         Optional<WelcomeSchool> wos = ws.stream().filter(e -> e.getSchool().equals(school)).findFirst();
                         if (wos != null && wos.isPresent()) {
-                            buildData.setSchoolId(wos.get().getId()+"");
-                        }else {
-                            int h=rowNum+1;
-                            return CommonResult.fail("第"+h+"行,不存在该校区");
+                            buildData.setSchoolId(wos.get().getId() + "");
+                        } else {
+                            int h = rowNum + 1;
+                            return CommonResult.fail("第" + h + "行,不存在该校区");
                         }
                         String build = dataFormatter.formatCellValue(row.getCell(2));//楼栋名称
                         Optional<WelcomeBuild> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();