yonge 3 éve
szülő
commit
a8688b3510

+ 9 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SixPlusGradeEnum.java

@@ -33,5 +33,14 @@ public enum SixPlusGradeEnum implements BaseEnum<Integer, SixPlusGradeEnum> {
 	public String getDesc() {
 		return desc;
 	}
+	
+	public static SixPlusGradeEnum get(String desc) {
+		for (SixPlusGradeEnum vpg : SixPlusGradeEnum.values()) {
+			if (vpg.getDesc().equals(desc)) {
+				return vpg;
+			}
+		}
+		return null;
+	}
 
 }

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

@@ -478,7 +478,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			si.setUserId(userId);
 			
 			student = new Student(userId, subjectMap.get(si.getSubjectName()) + "");
-	        student.setCurrentGradeNum(FivePlusGradeEnum.get(si.getGradeName()).getCode());
+	        student.setCurrentGradeNum(SixPlusGradeEnum.get(si.getGradeName()).getCode());
 			studentDao.insert(student);
 			// 添加用户现金账户
 			sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
@@ -491,7 +491,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	        studentRegistration.setSubjectId(subjectMap.get(si.getSubjectName()));
 	        studentRegistration.setUserId(userId);
 	        studentRegistration.setName(si.getName());
-	        studentRegistration.setGender(student.getCurrentGradeNum());
+	        studentRegistration.setGender(sysUser.getGender());
 	        studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
 	        studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.NORMAL);
 	        studentRegistration.setTemporaryCourseFee(BigDecimal.ZERO);

BIN
mec-web/src/main/resources/excelTemplate/外部学生入团导入模板.xls