update

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

@@ -38,5 +38,8 @@ public class MusicGroupPaymentImportDto {
 
     @ApiModelProperty(value = "年级")
     private String grade;
+
+    @ApiModelProperty(value = "班级")
+    private String currenClass;
 }
 

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

@@ -519,18 +519,23 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				si.setUserId(userDto.getUserId());
 			}
 			Integer userId = si.getUserId();
-			if(!existPhones.contains(si.getPhone())){
+			student = studentDao.get(userId);
+			if(Objects.isNull(student)){
 				student = new Student(userId, subjectMap.get(si.getSubjectName()) + "");
 				student.setCurrentGradeNum(SixPlusGradeEnum.get(si.getGrade()).getCode());
 				studentDao.insert(student);
 				// 添加用户现金账户
 				sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
+			}else {
+				student.setCurrentGradeNum(SixPlusGradeEnum.get(si.getGrade()).getCode());
+				studentDao.update(student);
 			}
 			studentRegistration = studentRegistrationService.getStudentRegister(musicGroupId,userId);
 			if(studentRegistration == null){
 				studentRegistration = new StudentRegistration();
 				String studentGrade = studentService.getStudentGrade(organization.getGradeType(), SixPlusGradeEnum.get(si.getGrade()).getCode());
 				studentRegistration.setCurrentGrade(studentGrade);
+				studentRegistration.setCurrentClass(si.getCurrenClass());
 				studentRegistration.setActualSubjectId(subjectMap.get(si.getSubjectName()));
 				studentRegistration.setIsAllowAdjust(YesOrNoEnum.YES);
 				studentRegistration.setSubjectId(subjectMap.get(si.getSubjectName()));
@@ -553,6 +558,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				if (studentRegistration.getMusicGroupStatus() != StudentMusicGroupStatusEnum.APPLY) {
 					throw new BizException("学员{}乐团状态不支持导入",si.getStudentName());
 				}
+				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.setMusicGroupStatus(StudentMusicGroupStatusEnum.NORMAL);
 				studentRegistrationDao.update(studentRegistration);
 				allList.add(studentRegistration);