|
@@ -32,10 +32,12 @@ import com.xjrsoft.module.banding.vo.BandingTaskClassReportStatisticsVo;
|
|
|
import com.xjrsoft.module.banding.vo.BandingTaskClassStudentListVo;
|
|
import com.xjrsoft.module.banding.vo.BandingTaskClassStudentListVo;
|
|
|
import com.xjrsoft.module.banding.vo.BandingTaskClassSureListVo;
|
|
import com.xjrsoft.module.banding.vo.BandingTaskClassSureListVo;
|
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
|
|
|
+import com.xjrsoft.module.base.entity.BaseClassTeacherChange;
|
|
|
import com.xjrsoft.module.base.entity.BaseClassroom;
|
|
import com.xjrsoft.module.base.entity.BaseClassroom;
|
|
|
import com.xjrsoft.module.base.entity.BaseGrade;
|
|
import com.xjrsoft.module.base.entity.BaseGrade;
|
|
|
import com.xjrsoft.module.base.entity.BaseMajorSet;
|
|
import com.xjrsoft.module.base.entity.BaseMajorSet;
|
|
|
import com.xjrsoft.module.base.mapper.BaseClassMapper;
|
|
import com.xjrsoft.module.base.mapper.BaseClassMapper;
|
|
|
|
|
+import com.xjrsoft.module.base.mapper.BaseClassTeacherChangeMapper;
|
|
|
import com.xjrsoft.module.base.mapper.BaseGradeMapper;
|
|
import com.xjrsoft.module.base.mapper.BaseGradeMapper;
|
|
|
import com.xjrsoft.module.base.service.IBaseClassroomService;
|
|
import com.xjrsoft.module.base.service.IBaseClassroomService;
|
|
|
import com.xjrsoft.module.base.service.IBaseMajorSetService;
|
|
import com.xjrsoft.module.base.service.IBaseMajorSetService;
|
|
@@ -60,6 +62,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
import java.math.RoundingMode;
|
|
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
|
import java.util.Comparator;
|
|
import java.util.Comparator;
|
|
@@ -93,7 +96,7 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
|
|
|
private final BaseGradeMapper gradeMapper;
|
|
private final BaseGradeMapper gradeMapper;
|
|
|
private final IUserRoleRelationService roleRelationService;
|
|
private final IUserRoleRelationService roleRelationService;
|
|
|
private final RedisUtil redisUtil;
|
|
private final RedisUtil redisUtil;
|
|
|
-
|
|
|
|
|
|
|
+ private final BaseClassTeacherChangeMapper teacherChangeMapper;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public Boolean add(BandingTaskClass bandingTaskClass) {
|
|
public Boolean add(BandingTaskClass bandingTaskClass) {
|
|
@@ -315,6 +318,15 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
|
|
|
}
|
|
}
|
|
|
classMapper.updateById(baseClass);
|
|
classMapper.updateById(baseClass);
|
|
|
|
|
|
|
|
|
|
+ teacherChangeMapper.insert(new BaseClassTeacherChange(){{
|
|
|
|
|
+ setClassId(baseClass.getId());
|
|
|
|
|
+ setBeforeTeacherId(baseClass.getTeacherId());
|
|
|
|
|
+ setAfterTeacherId(sourceObj.getTeacherId());
|
|
|
|
|
+ setDeleteMark(DeleteMark.NODELETE.getCode());
|
|
|
|
|
+ setEnabledMark(EnabledMark.ENABLED.getCode());
|
|
|
|
|
+ setCreateDate(LocalDateTime.now());
|
|
|
|
|
+ }});
|
|
|
|
|
+
|
|
|
//给该老师添加班主任角色
|
|
//给该老师添加班主任角色
|
|
|
if (baseClass.getTeacherId() != null) {
|
|
if (baseClass.getTeacherId() != null) {
|
|
|
long count = roleRelationService.count(
|
|
long count = roleRelationService.count(
|
|
@@ -350,6 +362,14 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
|
|
|
classMapper.insert(baseClass);
|
|
classMapper.insert(baseClass);
|
|
|
sourceObj.setBaseClassId(baseClass.getId());
|
|
sourceObj.setBaseClassId(baseClass.getId());
|
|
|
|
|
|
|
|
|
|
+ teacherChangeMapper.insert(new BaseClassTeacherChange(){{
|
|
|
|
|
+ setClassId(baseClass.getId());
|
|
|
|
|
+ setAfterTeacherId(sourceObj.getTeacherId());
|
|
|
|
|
+ setDeleteMark(DeleteMark.NODELETE.getCode());
|
|
|
|
|
+ setEnabledMark(EnabledMark.ENABLED.getCode());
|
|
|
|
|
+ setCreateDate(LocalDateTime.now());
|
|
|
|
|
+ }});
|
|
|
|
|
+
|
|
|
if (baseClass.getTeacherId() != null) {
|
|
if (baseClass.getTeacherId() != null) {
|
|
|
long count = roleRelationService.count(
|
|
long count = roleRelationService.count(
|
|
|
new QueryWrapper<UserRoleRelation>().lambda()
|
|
new QueryWrapper<UserRoleRelation>().lambda()
|