学生info接口增加班主任名称和寝室号

src/main/java/com/xjrsoft/module/room/mapper/RoomBedMapper.java

@@ -144,4 +144,6 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
      */
     List<AdjustBedClassPageVo> getClassTeacherInfo(@Param("dto") AdjustClassPageDto dto);
 
+    String getRoomNameByStudentUserId(Long id);
+
 }

src/main/java/com/xjrsoft/module/room/mapper/RoomMapper.java

@@ -62,4 +62,6 @@ public interface RoomMapper extends MPJBaseMapper<Room> {
      * @return
      */
     Boolean setIsmaxFalse();
+
+
 }

src/main/java/com/xjrsoft/module/room/service/IRoomBedService.java

@@ -106,4 +106,7 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dtoList 批量传入学生id和床位id
      */
     Boolean adjustBedBatch(List<AdjustStudentBedDto> dtoList);
+
+
+    String getRoomNameByStudentUserId(Long id);
 }

src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -670,4 +670,9 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
         return true;
     }
 
+    @Override
+    public String getRoomNameByStudentUserId(Long id) {
+        return roomBedMapper.getRoomNameByStudentUserId(id);
+    }
+
 }

src/main/java/com/xjrsoft/module/student/controller/StudentManagerController.java

@@ -18,14 +18,18 @@ import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseGradeService;
+import com.xjrsoft.module.concat.service.IXjrUserService;
+import com.xjrsoft.module.room.service.IRoomBedService;
 import com.xjrsoft.module.student.dto.AddBaseStudentUserDto;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentUserDto;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.service.IStudentManagerService;
+import com.xjrsoft.module.student.vo.BaseStudentSchoolRollVo;
 import com.xjrsoft.module.student.vo.BaseStudentTreeVo;
 import com.xjrsoft.module.student.vo.BaseStudentUserPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentUserVo;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -57,7 +61,8 @@ public class StudentManagerController {
     private final IStudentManagerService studentManagerService;
     private final IBaseGradeService baseGradeService;
     private final IBaseClassService baseClassService;
-
+    private final IXjrUserService xjrUserService;
+    private final IRoomBedService roomBedService;
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生列表(分页)")
     @SaCheckPermission("studentmanager:detail")
@@ -137,6 +142,16 @@ public class StudentManagerController {
             return R.error("找不到此数据！");
         }
         BaseStudentUserVo userVo = BeanUtil.toBean(baseStudentUser, BaseStudentUserVo.class);
+
+        for (BaseStudentSchoolRollVo roll : userVo.getBaseStudentSchoolRollList()) {
+            BaseClass aClass = baseClassService.getById(roll.getClassId());
+            XjrUser xjrUser = xjrUserService.getById(aClass.getTeacherId());
+            roll.setTeacherName(xjrUser.getName());
+
+            String roomName = roomBedService.getRoomNameByStudentUserId(roll.getUserId());
+            roll.setRoomName(roomName);
+        }
+
         userVo.setGenderCn(GenderDictionaryEnum.getValue(userVo.getGender()));
         return R.ok(userVo);
     }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentSchoolRollVo.java

@@ -145,4 +145,10 @@ public class BaseStudentSchoolRollVo {
     @ApiModelProperty("备注")
     private String remark;
 
+    @ApiModelProperty("班主任名字")
+    private String teacherName;
+
+    @ApiModelProperty("寝室号")
+    private String roomName;
+
 }

src/main/resources/mapper/room/RoomBedMapper.xml

@@ -412,4 +412,11 @@
             and t1.id = #{dto.classId}
         </if>
     </select>
+
+    <select id="getRoomNameByStudentUserId" resultType="java.lang.String">
+        SELECT t1.room_name FROM room t1
+        INNER JOIN room_bed t2 ON t1.id = t2.room_id
+        WHERE t1.delete_mark = 0 AND t1.delete_mark = 0
+        AND t2.student_user_id = #{id}
+    </select>
 </mapper>