辅导员分宿舍

dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java

@@ -843,6 +843,13 @@ public class ISrsDormitoryStudentServiceImpl extends ServiceImpl<SrsDormitoryStu
     public AjaxResult assignDormitoryByTeacher(String teacherEmployeeId) {
         try {
             List<SrsStuReg> stuList = srsDormitoryStudentMapper.listSmokeEarly(teacherEmployeeId);
+
+            List<String> kshList = stuList.stream().map(SrsStuReg::getKSH).collect(Collectors.toList());
+
+            QueryWrapper<DmsNewReg>  queryWrapper = new QueryWrapper<>();
+            queryWrapper.in("ksh",kshList);
+            _newRegMapper.delete(queryWrapper);
+
             List<DmsDormitoryClass> dormList = srsDormitoryStudentMapper.listFdyCanDorm(teacherEmployeeId);
 
             // 查询所有已分配的ksh，避免重复插入

dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml

@@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dormitoryId != null">and a.dormitory_id = #{dormitoryId}</if>
             <if test="classCode != null">and b.BJDM = #{classCode}</if>
         </where>
+        order by a.ksh asc
     </select>
 
     <select id="getStuDorm" resultType="DomInfo" parameterType="DmsSearch">

srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java

@@ -156,6 +156,7 @@ public class SrsStuRegServiceImpl extends ServiceImpl<SrsStuRegMapper, SrsStuReg
                     SrsStuReg stu = new SrsStuReg();
                     stu.setId(srsStuReg.getId());
                     stu.setBJDM(temp.教务系统班级编号);
+                    stu.setBJ(temp.班级名称);
                     needUpdateList.add(stu);
                 }
             }

srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml

@@ -745,7 +745,6 @@
         left join srs_class cl on a.bjdm=class_code
         left join cph_teacher t on cl.teacher_id=t.teacher_id
         <where>
-            a.reg_status in (1,3,4)
             <if test="BJDM != null">and a.BJDM = #{BJDM}</if>
             <if test="params.tNo != null">and t.employee_id = #{params.tNo}</if>
             <if test="MZ != null">and a.MZ like concat('%', #{MZ},'%')</if>