parent
14f42f6b69
commit
6b56c831cb
|
|
@ -184,8 +184,9 @@ public class H5MemberServiceImpl implements H5MemberService {
|
||||||
log.info("H5添加教育身份: memberId={}, educationId={}", memberId, education.getEducationId());
|
log.info("H5添加教育身份: memberId={}, educationId={}", memberId, education.getEducationId());
|
||||||
|
|
||||||
// 记录操作日志
|
// 记录操作日志
|
||||||
|
String logDesc = buildEducationLogDesc(dto, school);
|
||||||
memberLogService.log(memberId, MemberOperType.EDU_ADD.getCode(),
|
memberLogService.log(memberId, MemberOperType.EDU_ADD.getCode(),
|
||||||
MemberOperType.EDU_ADD.getTitle(), "学校:" + school.getSchoolName());
|
MemberOperType.EDU_ADD.getTitle(), logDesc);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -212,8 +213,9 @@ public class H5MemberServiceImpl implements H5MemberService {
|
||||||
log.info("H5修改教育身份: memberId={}, educationId={}", memberId, educationId);
|
log.info("H5修改教育身份: memberId={}, educationId={}", memberId, educationId);
|
||||||
|
|
||||||
// 记录操作日志
|
// 记录操作日志
|
||||||
|
String logDesc = buildEducationLogDesc(dto, school);
|
||||||
memberLogService.log(memberId, MemberOperType.EDU_EDIT.getCode(),
|
memberLogService.log(memberId, MemberOperType.EDU_EDIT.getCode(),
|
||||||
MemberOperType.EDU_EDIT.getTitle(), "学校:" + school.getSchoolName());
|
MemberOperType.EDU_EDIT.getTitle(), logDesc);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -285,6 +287,42 @@ public class H5MemberServiceImpl implements H5MemberService {
|
||||||
MemberOperType.EDU_SWITCH.getTitle(), "切换默认教育身份");
|
MemberOperType.EDU_SWITCH.getTitle(), "切换默认教育身份");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 构建教育身份日志描述
|
||||||
|
*/
|
||||||
|
private String buildEducationLogDesc(H5EducationDto dto, PgSchool school) {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append(school.getSchoolName());
|
||||||
|
|
||||||
|
// 获取年级名称
|
||||||
|
PgSchoolGrade schoolGrade = schoolGradeMapper.selectById(dto.getSchoolGradeId());
|
||||||
|
if (schoolGrade != null && schoolGrade.getGradeId() != null) {
|
||||||
|
PgGrade grade = gradeMapper.selectById(schoolGrade.getGradeId());
|
||||||
|
if (grade != null) {
|
||||||
|
sb.append(" / ").append(grade.getGradeName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取班级名称
|
||||||
|
PgSchoolClass schoolClass = schoolClassMapper.selectById(dto.getSchoolClassId());
|
||||||
|
if (schoolClass != null && schoolClass.getClassId() != null) {
|
||||||
|
PgClass cls = classMapper.selectById(schoolClass.getClassId());
|
||||||
|
if (cls != null) {
|
||||||
|
sb.append(" / ").append(cls.getClassName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取学科名称
|
||||||
|
if (dto.getSubjectId() != null) {
|
||||||
|
PgSubject subject = subjectMapper.selectById(dto.getSubjectId());
|
||||||
|
if (subject != null) {
|
||||||
|
sb.append(" / ").append(subject.getSubjectName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验并获取学校信息
|
* 校验并获取学校信息
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue