|
@@ -807,16 +807,22 @@ 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);
|
|
|
|
|
|
|
+ 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 {
|