Browse Source

add:乐团学生导入新增“所在班级”字段

yonge 2 weeks ago
parent
commit
c05561e480

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


+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentImportDto.java

@@ -12,6 +12,8 @@ public class StudentImportDto {
 	
 	private String gradeName;
 	
+	private String className;
+	
 	private Integer userId;
 
 	public String getName() {
@@ -54,6 +56,14 @@ public class StudentImportDto {
 		this.gradeName = gradeName;
 	}
 
+	public String getClassName() {
+		return className;
+	}
+
+	public void setClassName(String className) {
+		this.className = className;
+	}
+
 	public Integer getUserId() {
 		return userId;
 	}

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

@@ -292,6 +292,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         			throw new BizException("所在年级不能为空");
         		}
     			dto.setGradeName(row.get("所在年级").toString());
+        		
+        		if(row.get("所在班级") == null || StringUtils.isBlank(row.get("所在班级").toString())){
+        			throw new BizException("所在班级不能为空");
+        		}
+    			dto.setClassName(row.get("所在班级").toString());
 
     			studentBasicList.add(dto);
     		}
@@ -360,6 +365,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
 			student = new Student(userId, subjectMap.get(si.getSubjectName()) + "");
 	        student.setCurrentGradeNum(SixPlusGradeEnum.get(si.getGradeName()).getCode());
+	        student.setCurrentClass(si.getClassName());
 			studentDao.insert(student);
 			// 添加用户现金账户
 			sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
@@ -367,6 +373,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			studentRegistration = new StudentRegistration();
 	        String studentGrade = studentService.getStudentGrade(organization.getGradeType(), student.getCurrentGradeNum());
 	        studentRegistration.setCurrentGrade(studentGrade);
+	        studentRegistration.setCurrentClass(si.getClassName());
 	        studentRegistration.setActualSubjectId(subjectMap.get(si.getSubjectName()));
 	        studentRegistration.setIsAllowAdjust(YesOrNoEnum.YES);
 	        studentRegistration.setSubjectId(subjectMap.get(si.getSubjectName()));