|
@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
|
+import com.github.yulichang.toolkit.MPJWrappers;
|
|
|
import com.xjrsoft.module.room.dto.AddRoomDto;
|
|
|
import com.xjrsoft.module.room.dto.RoomPageDto;
|
|
|
import com.xjrsoft.module.room.entity.Room;
|
|
@@ -12,6 +13,7 @@ import com.xjrsoft.module.room.mapper.RoomBedMapper;
|
|
|
import com.xjrsoft.module.room.mapper.RoomMapper;
|
|
|
import com.xjrsoft.module.room.service.IRoomService;
|
|
|
import com.xjrsoft.module.room.vo.RoomPageVo;
|
|
|
+import com.xjrsoft.module.student.entity.BaseStudent;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -87,11 +89,19 @@ public class RoomServiceImpl extends MPJBaseServiceImpl<RoomMapper, Room> implem
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Boolean deleteReachBed(Long id) {
|
|
|
+ public String deleteReachBed(Long id) {
|
|
|
+ List<RoomBed> bedList = roomBedMapper.selectList(
|
|
|
+ MPJWrappers.<RoomBed>lambdaJoin()
|
|
|
+ .select(BaseStudent::getUserId)
|
|
|
+ .eq(RoomBed::getRoomId, id).isNotNull(RoomBed::getStudentUserId)
|
|
|
+ );
|
|
|
+ if(bedList != null && !bedList.isEmpty()){
|
|
|
+ return "寝室里面已安排学生,无法删除";
|
|
|
+ }
|
|
|
roomMapper.deleteById(id);
|
|
|
Map<String, Object> param = new HashMap<>();
|
|
|
param.put("room_id", id);
|
|
|
roomBedMapper.deleteByMap(param);
|
|
|
- return true;
|
|
|
+ return "ok";
|
|
|
}
|
|
|
}
|