|
|
@@ -7,6 +7,7 @@ import com.xjrsoft.common.enums.ArchivesStatusEnum;
|
|
|
import com.xjrsoft.common.enums.DeleteMark;
|
|
|
import com.xjrsoft.common.enums.StudentChangeTypeEnum;
|
|
|
import com.xjrsoft.common.enums.WorkflowApproveType;
|
|
|
+import com.xjrsoft.module.hikvision.util.DataUtil;
|
|
|
import com.xjrsoft.module.room.mapper.RoomBedMapper;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
|
|
|
import com.xjrsoft.module.student.entity.StudentDropOut;
|
|
|
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Component;
|
|
|
import org.springframework.transaction.support.TransactionSynchronization;
|
|
|
import org.springframework.transaction.support.TransactionSynchronizationManager;
|
|
|
|
|
|
+import java.util.Collections;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Optional;
|
|
|
@@ -102,7 +104,7 @@ public class StudentDropOutNode extends NodeComponent {
|
|
|
);
|
|
|
//清除床位信息
|
|
|
roomBedMapper.clearBedInfoByStudentUserId(studentDropOut.getStudentUserId(), studentDropOut.getCreateUserId());
|
|
|
- if(schoolRoll != null){
|
|
|
+ if (schoolRoll != null) {
|
|
|
//记录异动
|
|
|
changeRecordService.insertData(
|
|
|
ArchivesStatusEnum.fromCode(schoolRoll.getArchivesStatus()),
|
|
|
@@ -114,11 +116,16 @@ public class StudentDropOutNode extends NodeComponent {
|
|
|
StudentChangeTypeEnum.ArchivesStatus.getCode(),
|
|
|
2
|
|
|
);
|
|
|
-
|
|
|
schoolRoll.setArchivesStatus(ArchivesStatusEnum.FB2904.getCode());
|
|
|
studentSchoolRollService.updateById(schoolRoll);
|
|
|
studentSchoolRollService.disableStudent(schoolRoll.getUserId(), studentDropOut.getCreateUserId());
|
|
|
}
|
|
|
+ try {
|
|
|
+ // 学生退学后删除海康数据 2025-12-15
|
|
|
+ DataUtil dataUtil = new DataUtil();
|
|
|
+ dataUtil.deletePerson(Collections.singletonList(studentDropOut.getStudentUserId()));
|
|
|
+ } catch (Exception ignored) {
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
});
|
snihwxf