diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java index 521c948..b8eb767 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java @@ -1704,6 +1704,7 @@ public class TeacherServiceImpl implements TeacherService { ptTeacherInfo.setDegree(teacher.getDegree()); ptTeacherInfo.setGender(teacher.getGender()); ptTeacherInfo.setGrade(teacher.getGrade()); + ptTeacherInfo.setGradeName(teacher.getGradeName()); ptTeacherInfo.setPeriodId(teacher.getPeriodId()); ptTeacherInfo.setAge(teacher.getAge()); ptTeacherInfo.setTeachingAge(teacher.getTeachingAge()); @@ -1728,6 +1729,7 @@ public class TeacherServiceImpl implements TeacherService { ptTeacherInfo.setDegree(teacher.getDegree()); ptTeacherInfo.setGender(teacher.getGender()); ptTeacherInfo.setGrade(teacher.getGrade()); + ptTeacherInfo.setGradeName(teacher.getGradeName()); ptTeacherInfo.setPeriodId(teacher.getPeriodId()); ptTeacherInfo.setAge(teacher.getAge()); ptTeacherInfo.setTeachingAge(teacher.getTeachingAge()); diff --git a/src/main/java/cn/teammodel/model/entity/teacher/PtTeacherInfo.java b/src/main/java/cn/teammodel/model/entity/teacher/PtTeacherInfo.java index cef6d7c..db9fe7c 100644 --- a/src/main/java/cn/teammodel/model/entity/teacher/PtTeacherInfo.java +++ b/src/main/java/cn/teammodel/model/entity/teacher/PtTeacherInfo.java @@ -32,6 +32,7 @@ public class PtTeacherInfo extends BaseItem { public String degree; public String gender ; public List grade; + public List gradeName; public String periodId ; public List identity; public Integer age; diff --git a/src/main/java/cn/teammodel/model/vo/admin/GpTeacherVo.java b/src/main/java/cn/teammodel/model/vo/admin/GpTeacherVo.java index 66835e6..0fece75 100644 --- a/src/main/java/cn/teammodel/model/vo/admin/GpTeacherVo.java +++ b/src/main/java/cn/teammodel/model/vo/admin/GpTeacherVo.java @@ -26,6 +26,7 @@ public class GpTeacherVo { //表示数据是否有效 public Integer state; public List grade; + public List gradeName; public String periodId ; public Long joinTime ; public List identity; diff --git a/src/main/java/cn/teammodel/test/AsyncTeacherService.java b/src/main/java/cn/teammodel/test/AsyncTeacherService.java index cfa7aa1..4668c8c 100644 --- a/src/main/java/cn/teammodel/test/AsyncTeacherService.java +++ b/src/main/java/cn/teammodel/test/AsyncTeacherService.java @@ -181,6 +181,7 @@ public class AsyncTeacherService { ptTeacherInfo.setDegree(teacher.getDegree() != null ? teacher.getDegree() : ""); ptTeacherInfo.setGender(teacher.getGender() != null ? teacher.getGender() : "U"); // 未知性别默认值 ptTeacherInfo.setGrade(teacher.getGrade() != null ? teacher.getGrade() : Collections.emptyList()); + ptTeacherInfo.setGradeName(teacher.getGradeName() != null ? teacher.getGradeName() : Collections.emptyList()); ptTeacherInfo.setPeriodId(teacher.getPeriodId() != null ? teacher.getPeriodId() : ""); ptTeacherInfo.setTitle(teacher.getTitle() != null ? teacher.getTitle() : ""); ptTeacherInfo.setSource("ies");