Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

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

@@ -7,6 +7,7 @@ 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.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.annotation.PassToken;
@@ -811,18 +812,12 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         }
         //把旧床位清空
         WelcomeBed obedData = welcomeBedService.getBedByCardId(ws.getCardId());
-        if (obedData != null) {
-            obedData.setStudentCard(null);
-            obedData.setCollege(null);
-            obedData.setCollegeId(null);
-            obedData.setMajor(null);
-            obedData.setMajorId(null);
-            obedData.setClassstr(null);
-            obedData.setClassstrId(null);
-            obedData.setIsCheck(0);
-            obedData.setCardNum(null);
-            obedData.setName(null);
-        }
+//        if (obedData != null) {
+//            obedData.setStudentCard(null);
+//            obedData.setIsCheck(0);
+//            obedData.setCardNum(null);
+//            obedData.setName(null);
+//        }
 
         try {
             //删除学生数据
@@ -834,10 +829,27 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
             if (obedData != null) {
                 //删除宿舍数据
-                int deleteSd = welcomeBedService.updateWelcomeBed(obedData);
-                if (deleteSd < 0) {
-                    logger.error("删除宿舍失败，obedData参数：" + JSON.toJSON(obedData));
-                    throw new Exception("删除学生信息失败！");
+//                int deleteSd = welcomeBedService.updateWelcomeBed(obedData);
+//                if (deleteSd < 0) {
+//                    logger.error("删除宿舍失败，obedData参数：" + JSON.toJSON(obedData));
+//                    throw new Exception("删除学生信息失败！");
+//                }
+                welcomeBedService.updateData(obedData.getId());
+
+                //        修改寝室信息
+                WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getById(obedData.getDormitoryId());
+                if (ObjectUtils.isNotEmpty(welcomeDormitory)) {
+                    Integer freeBedNumber = welcomeDormitory.getFreeBedNumber();
+                    Integer bedNumber = welcomeDormitory.getBedNumber();
+                    freeBedNumber = freeBedNumber + 1;
+                    if (bedNumber.equals(freeBedNumber)) {
+                        welcomeDormitory.setFreeBedNumber(freeBedNumber);
+                        welcomeDormitory.setStatus(1);
+                    } else if (bedNumber > freeBedNumber) {
+                        welcomeDormitory.setFreeBedNumber(freeBedNumber);
+                        welcomeDormitory.setStatus(3);
+                    }
+                    welcomeDormitoryService.updateById(welcomeDormitory);
                 }
             }
             //删除同行人员