|
@@ -3,6 +3,7 @@ package com.xjrsoft.module.student.service.impl;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
|
+import com.xjrsoft.common.enums.ArchivesStatusEnum;
|
|
|
import com.xjrsoft.common.enums.EnabledMark;
|
|
|
import com.xjrsoft.common.enums.SchoolChangeType;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
|
|
@@ -57,6 +58,14 @@ public class SchoolRollStudentServiceImpl extends MPJBaseServiceImpl<SchoolRollS
|
|
|
XjrUser xjrUser = xjrUserMapper.selectOne(Wrappers.lambdaQuery(XjrUser.class).eq(XjrUser::getId, schoolRollStudent.getStudentId()));
|
|
|
xjrUser.setEnabledMark(EnabledMark.DISABLED.getCode());
|
|
|
xjrUserMapper.updateById(xjrUser);
|
|
|
+
|
|
|
+ BaseStudentSchoolRoll studentSchoolRoll = baseStudentSchoolRollMapper.selectOne(
|
|
|
+ Wrappers.lambdaQuery(BaseStudentSchoolRoll.class).eq(BaseStudentSchoolRoll::getUserId, schoolRollStudent.getStudentId())
|
|
|
+ );
|
|
|
+ if(ObjectUtil.isNotNull(studentSchoolRoll)){
|
|
|
+ studentSchoolRoll.setArchivesStatus(ArchivesStatusEnum.FB2902.getCode());
|
|
|
+ baseStudentSchoolRollMapper.updateById(studentSchoolRoll);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -69,6 +78,14 @@ public class SchoolRollStudentServiceImpl extends MPJBaseServiceImpl<SchoolRollS
|
|
|
XjrUser xjrUser = xjrUserMapper.selectOne(Wrappers.lambdaQuery(XjrUser.class).eq(XjrUser::getId, schoolRollStudent.getStudentId()));
|
|
|
xjrUser.setEnabledMark(EnabledMark.DISABLED.getCode());
|
|
|
xjrUserMapper.updateById(xjrUser);
|
|
|
+
|
|
|
+ BaseStudentSchoolRoll studentSchoolRoll = baseStudentSchoolRollMapper.selectOne(
|
|
|
+ Wrappers.lambdaQuery(BaseStudentSchoolRoll.class).eq(BaseStudentSchoolRoll::getUserId, schoolRollStudent.getStudentId())
|
|
|
+ );
|
|
|
+ if(ObjectUtil.isNotNull(studentSchoolRoll)){
|
|
|
+ studentSchoolRoll.setArchivesStatus(ArchivesStatusEnum.FB2904.getCode());
|
|
|
+ baseStudentSchoolRollMapper.updateById(studentSchoolRoll);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -84,9 +101,12 @@ public class SchoolRollStudentServiceImpl extends MPJBaseServiceImpl<SchoolRollS
|
|
|
BaseStudentSchoolRoll baseStudentSchoolRoll = baseStudentSchoolRollMapper.selectOne(
|
|
|
Wrappers.lambdaQuery(BaseStudentSchoolRoll.class).eq(BaseStudentSchoolRoll::getUserId, schoolRollStudent.getStudentId())
|
|
|
);
|
|
|
- baseStudentSchoolRoll.setClassId(schoolRollStudent.getBackClassId());
|
|
|
- baseStudentSchoolRoll.setGradeId(schoolRollStudent.getBackGradeId());
|
|
|
- baseStudentSchoolRollMapper.updateById(baseStudentSchoolRoll);
|
|
|
+ if(ObjectUtil.isNotNull(baseStudentSchoolRoll)){
|
|
|
+ baseStudentSchoolRoll.setClassId(schoolRollStudent.getBackClassId());
|
|
|
+ baseStudentSchoolRoll.setGradeId(schoolRollStudent.getBackGradeId());
|
|
|
+ baseStudentSchoolRoll.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
|
|
|
+ baseStudentSchoolRollMapper.updateById(baseStudentSchoolRoll);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|