From 6c3046bfbd775cac0f2420e3b4f66a8a74796288 Mon Sep 17 00:00:00 2001
From: zhy <17877871893@163.com>
Date: Sun, 7 Sep 2025 22:57:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=AF=BC=E5=91=98=E5=88=86=E5=AE=BF?=
 =?UTF-8?q?=E8=88=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ISrsDormitoryStudentServiceImpl.java      | 7 +++++++
 .../main/resources/mapper/dormitory/DmsNewRegMapper.xml    | 1 +
 .../controller/dormitory/DmsDormitoryClassController.java  | 2 +-
 .../com/srs/stureg/service/impl/SrsStuRegServiceImpl.java  | 1 +
 .../src/main/resources/mapper/stureg/SrsStuRegMapper.xml   | 1 -
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java b/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java
index 1682fdc..82ce7a0 100644
--- a/dms-dormitory/src/main/java/com/srs/dormitory/service/impl/ISrsDormitoryStudentServiceImpl.java
+++ b/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，避免重复插入
diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml
index ff266d7..0601499 100644
--- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRegMapper.xml
+++ b/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">
diff --git a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsDormitoryClassController.java b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsDormitoryClassController.java
index d41bccf..d17120b 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsDormitoryClassController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsDormitoryClassController.java
@@ -62,7 +62,7 @@ public class DmsDormitoryClassController extends BaseController {
 
 
     @Autowired
-    private ISrsDormitoryStudentService  iDormitoryStudentService;
+    private ISrsDormitoryStudentService iDormitoryStudentService;
 
 
     @ApiOperation("自动分配宿舍")
diff --git a/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java b/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java
index 69d0c64..3c3c50e 100644
--- a/srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java
+++ b/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);
                 }
             }
diff --git a/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml b/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml
index 28db8aa..f017866 100644
--- a/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml
+++ b/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>