导入

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

@@ -7,7 +7,6 @@ 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;
@@ -423,14 +422,6 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 //        //endregion
 
         try {
-//            获取床位数据
-            WelcomeBed bedByCardId = welcomeBedService.getBedByCardId(student.getCardId());
-            if (ObjectUtils.isNotEmpty(bedByCardId)) {
-                bedByCardId.setName(student.getName());
-                bedByCardId.setCardNum(student.getAdmissNum());
-                welcomeBedService.updateById(bedByCardId);
-            }
-
 
             int studentId = welcomeStudentService.updateWelcomeStudent(student);
             if (studentId <= 0) {
@@ -807,22 +798,16 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         //把旧床位清空
         WelcomeBed obedData = welcomeBedService.getBedByCardId(ws.getCardId());
         if (obedData != 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);
-            }
+            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);
         }
 
         try {
@@ -1110,7 +1095,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 if (!addressDatas[0].contains("省")) {
                                     return CommonResult.fail("录取编号为\" + assNum + \"的籍贯格式应该是 省/市/县");
                                 }
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getProvinceZh().equals(addressDatas[0])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressDatas[0])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setOprovince(addressDatas[0]);
                                     studentData.setOprovinceId(oProvince.get().getId());
@@ -1119,7 +1104,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressDatas != null && addressDatas.length >= 2) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressDatas[1])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressDatas[1])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setOcity(addressDatas[1]);
                                     studentData.setOcityId(oProvince.get().getId());
@@ -1147,7 +1132,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 if (!addressPlaces[0].contains("省")) {
                                     return CommonResult.fail("录取编号为" + assNum + "的家庭住址格式应该是 省/市/县区");
                                 }
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getProvinceZh().equals(addressPlaces[0])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressPlaces[0])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setProvince(addressPlaces[0]);
                                     studentData.setProvinceId(oProvince.get().getId());
@@ -1156,7 +1141,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressPlaces != null && addressPlaces.length >= 2) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressPlaces[1])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressPlaces[1])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setCity(addressPlaces[1]);
                                     studentData.setCityId(oProvince.get().getId());
@@ -1372,7 +1357,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 if (!addressDatas[0].contains("省")) {
                                     return CommonResult.fail("录取编号为\" + assNum + \"的籍贯格式应该是 省/市/县区");
                                 }
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getProvinceZh().equals(addressDatas[0])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressDatas[0])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setOprovince(addressDatas[0]);
                                     studentData.setOprovinceId(oProvince.get().getId());
@@ -1381,7 +1366,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressDatas != null && addressDatas.length >= 2) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressDatas[1])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressDatas[1])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setOcity(addressDatas[1]);
                                     studentData.setOcityId(oProvince.get().getId());
@@ -1409,7 +1394,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 if (!addressPlaces[0].contains("省")) {
                                     return CommonResult.fail("录取编号为" + assNum + "的家庭住址格式应该是 省/市/县区");
                                 }
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getProvinceZh().equals(addressPlaces[0])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressPlaces[0])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setProvince(addressPlaces[0]);
                                     studentData.setProvinceId(oProvince.get().getId());
@@ -1418,7 +1403,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                                 }
                             }
                             if (addressPlaces != null && addressPlaces.length >= 2) {
-                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getCityZh().equals(addressPlaces[1])).findFirst();
+                                Optional<WelcomeCity> oProvince = citys.stream().filter(e -> e.getDistrictZh().equals(addressPlaces[1])).findFirst();
                                 if (oProvince != null && oProvince.isPresent()) {
                                     studentData.setCity(addressPlaces[1]);
                                     studentData.setCityId(oProvince.get().getId());