代码

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

@@ -100,7 +100,12 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             welcomeBeds.add(welcomeBed);
         }
 
-        welcomeBedService.saveBatch(welcomeBeds);
+        if(welcomeBeds != null && welcomeBeds.size() > 0){
+            boolean insertBeds = welcomeBedService.saveBatch(welcomeBeds);
+            if(!insertBeds){
+                return CommonResult.fail("新增失败");
+            }
+        }
 
         return CommonResult.ok();
     }
@@ -132,26 +137,64 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             }
         }
 
-        welcomeDormitoryService.updateById(welcomeDormitory);
+        boolean updateDormitory = welcomeDormitoryService.updateById(welcomeDormitory);
+        if(!updateDormitory){
+            return CommonResult.fail("编辑失败");
+        }
 
 //        动态修改床位
         List<WelcomeBed> list = welcomeBedService.listWelcomeBed(welcomeDormitory.getId());
-        ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
-        for (WelcomeBed welcomeBed : list) {
-            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.setMajor(welcomeDormitory.getMajor());
-            welcomeBed.setMajorId(welcomeDormitory.getMajorId());
-            welcomeBeds.add(welcomeBed);
+        if(list != null && list.size() > 0){
+            ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
+            for (WelcomeBed welcomeBed : list) {
+                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.setMajor(welcomeDormitory.getMajor());
+                welcomeBed.setMajorId(welcomeDormitory.getMajorId());
+                welcomeBeds.add(welcomeBed);
+            }
+            boolean updateResult = welcomeBedService.updateBatchById(welcomeBeds);
+            if(!updateResult){
+                return CommonResult.fail("编辑失败");
+            }
+        }else {
+            //动态生成床位
+            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.setMajor(welcomeDormitory.getMajor());
+                welcomeBed.setMajorId(welcomeDormitory.getMajorId());
+                welcomeBed.setIsCheck(0);
+                welcomeBeds.add(welcomeBed);
+            }
+            if(welcomeBeds != null && welcomeBeds.size() > 0){
+                boolean insertBeds = welcomeBedService.saveBatch(welcomeBeds);
+                if(!insertBeds){
+                    return CommonResult.fail("编辑失败");
+                }
+            }
+
+
         }
-        welcomeBedService.updateBatchById(welcomeBeds);
+
         return CommonResult.ok();
     }