Bläddra i källkod

1、毕业登记将学生在读状态改为非在读时清空床位
2、寝室调整班级搜索未实现

dzx 8 månader sedan
förälder
incheckning
06d460f82b

+ 4 - 0
src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentSchoolRollServiceImpl.java

@@ -138,6 +138,10 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
                         2
                 );
             }
+            if((dto.getArchivesStatus() != null && !ArchivesStatusEnum.FB2901.getCode().equals(dto.getArchivesStatus())
+                    || (dto.getStduyStatus() != null && !StudyStatusEnum.InResidence.getCode().equals(dto.getStduyStatus())))){
+                roomBedMapper.clearBedInfoByStudentUserId(id, StpUtil.getLoginIdAsLong());
+            }
 
             baseStudentSchoolRollMapper.updateInfoByUserId(dto, id);
         }

+ 3 - 0
src/main/resources/mapper/room/RoomBedMapper.xml

@@ -362,6 +362,9 @@
             and t2.floor_number = #{dto.floorNumber}
         </if>
         <if test="dto.classId != null and dto.isTeacher != null and dto.isTeacher == 1">
+            AND t8.id = #{dto.classId}
+        </if>
+        <if test="dto.classId != null and dto.isTeacher == null">
             AND (t2.id IN (
             SELECT DISTINCT c1.room_id FROM room_bed c1
             INNER JOIN base_student_school_roll c2 ON c1.student_user_id = c2.user_id