|
|
@@ -666,8 +666,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
|
//获取分部年级列表
|
|
|
Map<Integer, String> gradeList = organizationService.getGradeList(1);
|
|
|
for (EduOrganStudentListDto eduOrganStudentListDto : dataList1) {
|
|
|
- EduOrganStudentListExportDto data = new EduOrganStudentListExportDto();
|
|
|
- BeanUtils.copyProperties(eduOrganStudentListDto, data);
|
|
|
+ EduOrganStudentListExportDto data = JSON.parseObject(JSON.toJSONString(eduOrganStudentListDto),EduOrganStudentListExportDto.class);
|
|
|
data.setOrganName(organMap.get(data.getOrganId()));
|
|
|
data.setSubjectName(subjectMap.get(data.getSubjectId()));
|
|
|
if (StringUtils.isNotEmpty(eduOrganStudentListDto.getCurrentGradeNum())) {
|
