优化床位

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

@@ -77,7 +77,11 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         welcomeDormitory.setStatus(2);
         welcomeDormitory.setFreeBedNumber(welcomeDormitory.getBedNumber());
 
-        welcomeDormitoryService.save(welcomeDormitory);
+        boolean insertWd = welcomeDormitoryService.save(welcomeDormitory);
+        if(!insertWd){
+            return CommonResult.fail("新增失败");
+
+        }
 
         //动态生成床位
         Integer bedNumber = welcomeDormitory.getBedNumber();
@@ -145,8 +149,22 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 //        动态修改床位
         List<WelcomeBed> list = welcomeBedService.listWelcomeBed(welcomeDormitory.getId());
         if(list != null && list.size() > 0){
+            int i = 1;
             ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
             for (WelcomeBed welcomeBed : list) {
+                if(welcomeBed.getNumber().intValue() != i){
+                    WelcomeBed welcomeInsert = new WelcomeBed();
+                    welcomeInsert.setNumber(i);
+                    welcomeInsert.setSchool(welcomeDormitory.getSchool());
+                    welcomeInsert.setSchoolId(welcomeDormitory.getSchoolId());
+                    welcomeInsert.setBuild(welcomeDormitory.getBuild());
+                    welcomeInsert.setBuildId(welcomeDormitory.getBuildId());
+                    welcomeInsert.setDormitory(welcomeDormitory.getDormitory());
+                    welcomeInsert.setDormitoryId(welcomeDormitory.getId());
+                    welcomeInsert.setSex(welcomeDormitory.getSex());
+                    welcomeInsert.setIsCheck(0);
+                    welcomeBeds.add(welcomeInsert);
+                }
                 welcomeBed.setSchool(welcomeDormitory.getSchool());
                 welcomeBed.setSchoolId(welcomeDormitory.getSchoolId());
                 welcomeBed.setBuild(welcomeDormitory.getBuild());
@@ -154,13 +172,10 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                 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);
+                i++;
             }
-            boolean updateResult = welcomeBedService.updateBatchById(welcomeBeds);
+            boolean updateResult = welcomeBedService.saveOrUpdateBatch(welcomeBeds);
             if(!updateResult){
                 return CommonResult.fail("编辑失败");
             }
@@ -178,10 +193,6 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                 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);
             }