|
@@ -42,11 +42,9 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
|
|
|
@Override
|
|
@Override
|
|
|
public BaseStudentInfoDetailVo getInfoById(Long id) {
|
|
public BaseStudentInfoDetailVo getInfoById(Long id) {
|
|
|
BaseStudentInfoDetailVo info = baseStudentSchoolRollMapper.getInfoById(id);
|
|
BaseStudentInfoDetailVo info = baseStudentSchoolRollMapper.getInfoById(id);
|
|
|
- if("FB3002".equals(info.getStduyStatus())){
|
|
|
|
|
- RoomBedInfoVo bedInfoByUserId = roomBedMapper.getBedInfoByUserId(info.getId());
|
|
|
|
|
- if(bedInfoByUserId != null){
|
|
|
|
|
- info.setBedInfo(bedInfoByUserId.getBuildName() + " " + bedInfoByUserId.getRoomName() + " " + bedInfoByUserId.getBedNumber());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ RoomBedInfoVo bedInfoByUserId = roomBedMapper.getBedInfoByUserId(info.getId());
|
|
|
|
|
+ if(bedInfoByUserId != null){
|
|
|
|
|
+ info.setBedInfo(bedInfoByUserId.getBuildName() + " " + bedInfoByUserId.getRoomName() + " " + bedInfoByUserId.getBedNumber());
|
|
|
}
|
|
}
|
|
|
return info;
|
|
return info;
|
|
|
}
|
|
}
|