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 @@
aviator
5.3.3
+
+ com.srs.dormitory
+ dms-dormitory
+ 3.8.5
+ compile
+
@@ -88,4 +94,4 @@
8
-
\ No newline at end of file
+
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 @@
where stu_no = #{stuNo}
+
+ delete from srs_dormitory_student where stu_no=#{stuNo}
+
-
\ No newline at end of file
+