Ver código fonte

更新删除学生信息接口

liu 1 ano atrás
pai
commit
1cc2ae12c1

+ 19 - 10
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.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.annotation.PassToken;
 import com.template.annotation.PassToken;
@@ -798,16 +799,24 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         //把旧床位清空
         //把旧床位清空
         WelcomeBed obedData = welcomeBedService.getBedByCardId(ws.getCardId());
         WelcomeBed obedData = welcomeBedService.getBedByCardId(ws.getCardId());
         if (obedData != null) {
         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);
+//            将入住信息改成未入住,身份证号,录取号,名字设置成null
+            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);
+            }
         }
         }
 
 
         try {
         try {