|
|
@@ -42,6 +42,7 @@ import com.xjrsoft.module.student.entity.BaseStudent;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
|
|
|
import com.xjrsoft.module.student.mapper.BaseStudentMapper;
|
|
|
import com.xjrsoft.module.teacher.entity.XjrUser;
|
|
|
+import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -64,6 +65,7 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
|
|
|
private final RoomBedMapper roomBedMapper;
|
|
|
private final BaseStudentMapper baseStudentMapper;
|
|
|
private final BaseClassMapper baseClassMapper;
|
|
|
+ private final XjrUserMapper xjrUserMapper;
|
|
|
private final RoomBedRecordMapper roomBedRecordMapper;
|
|
|
@Override
|
|
|
public Page<RoomBedPageVo> getPage(Page<RoomBedPageVo> page, RoomBedPageDto dto) {
|
|
|
@@ -279,6 +281,20 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
|
|
|
|
|
|
@Override
|
|
|
public Boolean adjustBed(AdjustStudentBedDto dto) {
|
|
|
+ //查询学生的性别
|
|
|
+ XjrUser xjrUser = xjrUserMapper.selectById(dto.getStudentUserId());
|
|
|
+ String studentGender = null;
|
|
|
+ if(1 == xjrUser.getGender()){
|
|
|
+ studentGender = "SB10001";
|
|
|
+ }else if(2 == xjrUser.getGender()){
|
|
|
+ studentGender = "SB10002";
|
|
|
+ }
|
|
|
+ RoomBed roomBedInfo = roomBedMapper.selectById(dto.getBedId());
|
|
|
+ Room room = roomMapper.selectById(roomBedInfo.getRoomId());
|
|
|
+ if(!room.getGender().equals(studentGender)){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
//先清空学生原来的床位
|
|
|
UpdateWrapper<RoomBed> updateWrapper = new UpdateWrapper<>();
|
|
|
updateWrapper.eq("student_user_id", dto.getStudentUserId());
|