1、管理管理查询排序

2、班级管理默认查询在读班级
3、学生毕业后清除床位信息

src/main/java/com/xjrsoft/module/base/dto/BaseClassPageDto.java

@@ -39,7 +39,7 @@ public class BaseClassPageDto extends PageInput {
     private Long teacherId;
 
     @ApiModelProperty("在读状态(1: 在读 2: 毕业)")
-    private Integer isGraduate;
+    private Integer isGraduate = 1;
 
     @ApiModelProperty("是否订单班(1: 是 0: 否)")
     private Integer isOrderClass;

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

@@ -2,11 +2,30 @@ package com.xjrsoft.module.room.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.room.dto.*;
+import com.xjrsoft.module.room.dto.AdjustBedPageDto;
+import com.xjrsoft.module.room.dto.AdjustClassPageDto;
+import com.xjrsoft.module.room.dto.DistributeClassPageDto;
+import com.xjrsoft.module.room.dto.DistributeRoomBedDto;
+import com.xjrsoft.module.room.dto.DistributeRoomBedPageDto;
+import com.xjrsoft.module.room.dto.RoomBedPageDto;
 import com.xjrsoft.module.room.entity.RoomBed;
-import com.xjrsoft.module.room.vo.*;
+import com.xjrsoft.module.room.vo.AdjustBedClassPageVo;
+import com.xjrsoft.module.room.vo.AdjustBedClassStudentPageVo;
+import com.xjrsoft.module.room.vo.AdjustBedStudentPageVo;
+import com.xjrsoft.module.room.vo.ClassStudentCountVo;
+import com.xjrsoft.module.room.vo.DistributeClassPageVo;
+import com.xjrsoft.module.room.vo.DistributeResultListVo;
+import com.xjrsoft.module.room.vo.DistributeRoomBedPageVo;
+import com.xjrsoft.module.room.vo.NoBedStudentPageVo;
+import com.xjrsoft.module.room.vo.RoomBedExcelVo;
+import com.xjrsoft.module.room.vo.RoomBedInfoVo;
+import com.xjrsoft.module.room.vo.RoomBedPageVo;
+import com.xjrsoft.module.room.vo.RoomBedVo;
+import com.xjrsoft.module.room.vo.StudentPayStatusVo;
+import com.xjrsoft.module.room.vo.TeacherRoomListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -20,17 +39,12 @@ import java.util.List;
 public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
     /**
      * 返回最大的序号
-     *
-     * @return
      */
     Integer getMaxSortCode();
 
     /**
      * 分页查询
      *
-     * @param page
-     * @param dto
-     * @return
      */
     Page<RoomBedPageVo> getPage(Page<RoomBedPageVo> page, RoomBedPageDto dto);
 
@@ -45,34 +59,24 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
     /**
      * 返回分配的结果
      *
-     * @param dto
-     * @return
      */
     List<DistributeResultListVo> getDistributeResult(@Param("dto") DistributeRoomBedDto dto);
 
     /**
      * 调整床位，左边的班级学生信息
      *
-     * @param dto
-     * @return
      */
     List<AdjustBedClassStudentPageVo> getClassStudetBed(@Param("dto") AdjustClassPageDto dto);
 
     /**
      * 调整床位，右边的床位学生信息
      *
-     * @param dto
-     * @return
      */
     List<AdjustBedStudentPageVo> getBedStudentInfo(@Param("dto") AdjustBedPageDto dto);
 
 
     /**
      * 未分配床位的学生信息
-     *
-     * @param page
-     * @param dto
-     * @return
      */
     Page<NoBedStudentPageVo> getNoBedStudent(Page<AdjustBedPageDto> page, AdjustBedPageDto dto);
 
@@ -115,24 +119,18 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
     /**
      * 根据用户id查询床位信息
      *
-     * @param id
-     * @return
      */
     RoomBedInfoVo getBedInfoByUserId(Long id);
 
     /**
      * 查询学生的住宿费缴费状态
      *
-     * @param dto
-     * @return
      */
     List<StudentPayStatusVo> getStudentPayStatus(@Param("dto") DistributeRoomBedDto dto);
 
     /**
      * 查询班级id、名称和班主任信息
      *
-     * @param dto
-     * @return
      */
     List<AdjustBedClassPageVo> getClassTeacherInfo(@Param("dto") AdjustClassPageDto dto);
 
@@ -140,4 +138,8 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
 
     List<TeacherRoomListVo> getTeacherRoomList(@Param("dto") AdjustBedPageDto dto);
 
+
+    @Update("UPDATE room_bed SET student_user_id = NULL,is_check_in = 0,modify_user_id = #{updateUserId}, modify_date = NOW() WHERE student_user_id = #{studentUserId}")
+    void clearBedInfoByStudentUserId(@Param("studentUserId") Long studentUserId, @Param("updateUserId") Long updateUserId);
+
 }

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentGraduateServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.enums.ArchivesStatusEnum;
+import com.xjrsoft.module.room.mapper.RoomBedMapper;
 import com.xjrsoft.module.student.dto.AddBaseStudentGraduateDto;
 import com.xjrsoft.module.student.dto.BaseStudentGraduatePageDto;
 import com.xjrsoft.module.student.entity.BaseStudentGraduate;
@@ -40,6 +41,8 @@ public class BaseStudentGraduateServiceImpl extends MPJBaseServiceImpl<BaseStude
 
     private final IFileService fileService;
 
+    private final RoomBedMapper roomBedMapper;
+
     @Override
     public Page<BaseStudentGraduatePageVo> getPage(Page<BaseStudentGraduatePageDto> page, BaseStudentGraduatePageDto dto) {
         Page<BaseStudentGraduatePageVo> voPage = baseStudentGraduateMapper.getPage(page, dto);
@@ -79,6 +82,8 @@ public class BaseStudentGraduateServiceImpl extends MPJBaseServiceImpl<BaseStude
             setArchivesStatus(ArchivesStatusEnum.FB2907.getCode());
         }}, baseStudentSchoolRollLambdaQueryWrapper);
 
+        //清空该学生的床位信息
+        roomBedMapper.clearBedInfoByStudentUserId(dto.getUserId(), StpUtil.getLoginIdAsLong());
         //保存毕业信息
         this.save(baseStudentGraduate);
         return true;

src/main/resources/mapper/base/BaseClass.xml

@@ -96,6 +96,7 @@
         <if test="dto.enrollType != null and dto.enrollType != ''">
             and t1.enroll_type = #{dto.enrollType}
         </if>
+        order by t1.name desc
     </select>
 
     <select id="getStudentClass" resultType="com.xjrsoft.module.base.vo.StudentClassVo">