zouxuan 2 年之前
父节点
当前提交
d2274135fa

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupPaymentImportDto.java

@@ -40,6 +40,6 @@ public class MusicGroupPaymentImportDto {
     private String grade;
 
     @ApiModelProperty(value = "班级")
-    private String currenClass;
+    private String currentClass;
 }
 

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -535,7 +535,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				studentRegistration = new StudentRegistration();
 				String studentGrade = studentService.getStudentGrade(organization.getGradeType(), SixPlusGradeEnum.get(si.getGrade()).getCode());
 				studentRegistration.setCurrentGrade(studentGrade);
-				studentRegistration.setCurrentClass(si.getCurrenClass());
+				studentRegistration.setCurrentClass(si.getCurrentClass());
 				studentRegistration.setActualSubjectId(subjectMap.get(si.getSubjectName()));
 				studentRegistration.setIsAllowAdjust(YesOrNoEnum.YES);
 				studentRegistration.setSubjectId(subjectMap.get(si.getSubjectName()));
@@ -561,7 +561,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				String studentGrade = studentService.getStudentGrade(organization.getGradeType(), SixPlusGradeEnum.get(si.getGrade()).getCode());
 				studentRegistration.setGender(si.getGender().equals("男") ? 1 : 0);
 				studentRegistration.setCurrentGrade(studentGrade);
-				studentRegistration.setCurrentClass(si.getCurrenClass());
+				studentRegistration.setCurrentClass(si.getCurrentClass());
 				studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.NORMAL);
 				studentRegistrationDao.update(studentRegistration);
 				allList.add(studentRegistration);

+ 2 - 1
mec-web/src/main/resources/columnMapper.ini

@@ -120,4 +120,5 @@ ID = id
 性别 = gender
 手机号 = phone
 声部 = subjectName
-年级 = grade
+年级 = grade
+班级 = currentClass