From 9497658af5624737fdbbeffe112f95630bf64c40 Mon Sep 17 00:00:00 2001
From: 15976874561 <2553956742@qq.com>
Date: Tue, 5 Aug 2025 16:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E4=BA=88=E9=80=80=E5=AD=A6=EF=BC=8C?=
 =?UTF-8?q?=E9=80=80=E5=AD=A6=EF=BC=8C=E4=BC=91=E5=AD=A6=EF=BC=8C=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E7=8F=AD=E7=BA=A7=E5=92=8C=E5=AE=BF=E8=88=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 srs-flowable/pom.xml                                      | 8 +++++++-
 .../disqualification/DisqualificationStatusListener.java  | 4 ++++
 .../dropOutSchoo/DropOutSchoolStatusListener.java         | 4 ++++
 .../listener/quitSchool/QuitSchoolStatusListener.java     | 4 ++++
 .../java/com/srs/flowable/mapper/DisciplinaryMapper.java  | 5 +++++
 .../src/main/resources/mapper/DisciplinaryMapper.xml      | 5 ++++-
 6 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/srs-flowable/pom.xml b/srs-flowable/pom.xml
index 6328ef0..65b1985 100644
--- a/srs-flowable/pom.xml
+++ b/srs-flowable/pom.xml
@@ -81,6 +81,12 @@
             <artifactId>aviator</artifactId>
             <version>5.3.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.srs.dormitory</groupId>
+            <artifactId>dms-dormitory</artifactId>
+            <version>3.8.5</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
     <properties>
@@ -88,4 +94,4 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disqualification/DisqualificationStatusListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disqualification/DisqualificationStatusListener.java
index b6ba5af..11dba65 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disqualification/DisqualificationStatusListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disqualification/DisqualificationStatusListener.java
@@ -3,6 +3,7 @@ package com.srs.flowable.listener.disqualification;
 import com.srs.common.utils.DateUtils;
 import com.srs.common.utils.SecurityUtils;
 import com.srs.common.utils.spring.SpringUtils;
+import com.srs.dormitory.domain.SrsDormitoryStudent;
 import com.srs.flowable.domain.StuDisqualification;
 import com.srs.flowable.domain.Student;
 import com.srs.flowable.mapper.DisciplinaryMapper;
@@ -45,6 +46,9 @@ public class DisqualificationStatusListener implements TaskListener {
             disciplinaryMapper.updateStudentStatus(student);
             disciplinaryMapper.updateStudentStatus(student);
             // todo 辅导员给予退学：1、宿舍
+            SrsDormitoryStudent dormitoryStudent=new SrsDormitoryStudent();
+            dormitoryStudent.setStuNo(disqualificationId.getStuNo());
+            disciplinaryMapper.deleteDormitoryStudent(dormitoryStudent);
             //2、综测
             //3、班级
         }
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/dropOutSchoo/DropOutSchoolStatusListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/dropOutSchoo/DropOutSchoolStatusListener.java
index 1e14424..8316c59 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/dropOutSchoo/DropOutSchoolStatusListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/dropOutSchoo/DropOutSchoolStatusListener.java
@@ -3,6 +3,7 @@ package com.srs.flowable.listener.dropOutSchoo;
 import com.srs.common.utils.DateUtils;
 import com.srs.common.utils.SecurityUtils;
 import com.srs.common.utils.spring.SpringUtils;
+import com.srs.dormitory.domain.SrsDormitoryStudent;
 import com.srs.flowable.domain.StuDropOutSchool;
 import com.srs.flowable.domain.StuQuitSchool;
 import com.srs.flowable.domain.Student;
@@ -43,6 +44,9 @@ public class DropOutSchoolStatusListener implements TaskListener {
             disciplinaryMapper.updateStudentStatus(student);
 
             // todo 学生自动退学：
+            SrsDormitoryStudent dormitoryStudent=new SrsDormitoryStudent();
+            dormitoryStudent.setStuNo(stuDropOutSchool.getStuNo());
+            disciplinaryMapper.deleteDormitoryStudent(dormitoryStudent);
         }else{
             throw new RuntimeException("该退学申请不存在");
         }
diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/quitSchool/QuitSchoolStatusListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/quitSchool/QuitSchoolStatusListener.java
index ae851b7..a93bf68 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/quitSchool/QuitSchoolStatusListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/quitSchool/QuitSchoolStatusListener.java
@@ -3,6 +3,7 @@ package com.srs.flowable.listener.quitSchool;
 import com.srs.common.utils.DateUtils;
 import com.srs.common.utils.SecurityUtils;
 import com.srs.common.utils.spring.SpringUtils;
+import com.srs.dormitory.domain.SrsDormitoryStudent;
 import com.srs.flowable.domain.StuQuitSchool;
 import com.srs.flowable.domain.Student;
 import com.srs.flowable.mapper.DisciplinaryMapper;
@@ -40,6 +41,9 @@ public class QuitSchoolStatusListener implements TaskListener {
             student.setUpdateTime(DateUtils.getNowDate());
             disciplinaryMapper.updateStudentStatus(student);
             // todo 学生自动休学：
+            SrsDormitoryStudent dormitoryStudent=new SrsDormitoryStudent();
+            dormitoryStudent.setStuNo(quitSchoolId.getStuNo());
+            disciplinaryMapper.deleteDormitoryStudent(dormitoryStudent);
         } else {
             throw new RuntimeException("该休学申请不存在");
         }
diff --git a/srs-flowable/src/main/java/com/srs/flowable/mapper/DisciplinaryMapper.java b/srs-flowable/src/main/java/com/srs/flowable/mapper/DisciplinaryMapper.java
index e9e7814..30913fc 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/mapper/DisciplinaryMapper.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/mapper/DisciplinaryMapper.java
@@ -1,5 +1,6 @@
 package com.srs.flowable.mapper;
 
+import com.srs.dormitory.domain.SrsDormitoryStudent;
 import com.srs.flowable.domain.StuDisciplinaryApplication;
 import com.srs.flowable.domain.Student;
 import org.apache.ibatis.annotations.Param;
@@ -39,6 +40,10 @@ public interface DisciplinaryMapper {
      * @return
      */
     int updateStudentStatus(Student student);
+    /***
+     * 清空宿舍
+     */
 
+    int deleteDormitoryStudent(SrsDormitoryStudent srsDormitoryStudent);
 
 }
diff --git a/srs-flowable/src/main/resources/mapper/DisciplinaryMapper.xml b/srs-flowable/src/main/resources/mapper/DisciplinaryMapper.xml
index 5ff1edc..9335df8 100644
--- a/srs-flowable/src/main/resources/mapper/DisciplinaryMapper.xml
+++ b/srs-flowable/src/main/resources/mapper/DisciplinaryMapper.xml
@@ -78,6 +78,9 @@
         </trim>
         where stu_no = #{stuNo}
     </update>
+    <delete id="deleteDormitoryStudent" parameterType="SrsDormitoryStudent">
+        delete from srs_dormitory_student where stu_no=#{stuNo}
+    </delete>
 
     <select id="getApprovalByDeptIdAndRoleKey" resultType="java.lang.Long">
         SELECT a.user_id FROM sys_user a
@@ -99,4 +102,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>