|
@@ -274,12 +274,12 @@ public class StudentRegistrationController extends BaseController {
|
|
|
MusicGroup musicGroup = musicGroupDao.get(queryInfo.getMusicGroupId());
|
|
|
for (StudentPreRegistrationDto row : studentPreRegistration.getRows()) {
|
|
|
if (row.getKitPurchaseMethod().equals("OWNED")) {
|
|
|
- row.setKitPurchaseMethod("自备");
|
|
|
+ row.setKitPurchaseMethod("自行准备");
|
|
|
} else if (row.getKitPurchaseMethod().equals("GROUP")) {
|
|
|
row.setKitPurchaseMethod("团购");
|
|
|
}
|
|
|
if ("OWNED".equals(row.getCloudTeacherMethod())) {
|
|
|
- row.setCloudTeacherMethod("自备");
|
|
|
+ row.setCloudTeacherMethod("自行准备");
|
|
|
} else if ("GROUP".equals(row.getCloudTeacherMethod())) {
|
|
|
row.setCloudTeacherMethod("团购");
|
|
|
}
|
|
@@ -295,7 +295,7 @@ public class StudentRegistrationController extends BaseController {
|
|
|
try {
|
|
|
HSSFWorkbook workbook = null;
|
|
|
if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.CLOUD_TEACHER)) {
|
|
|
- String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "选报声部1", "选报声部2", "是否服从调剂", "乐器准备方式", "系统意向"};
|
|
|
+ String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "选报声部1", "选报声部2", "是否服从调剂", "乐器准备方式", "练习系统"};
|
|
|
String[] body = {"userId", "userName", "gender ? '男' : '女'", "phone", "currentGrade", "subjectFirstName", "subjectSecondName", "isAllowAdjust ? '是' : '否'", "kitPurchaseMethod", "cloudTeacherMethod"};
|
|
|
workbook = POIUtil.exportExcel(header, body, studentPreRegistration.getRows());
|
|
|
} else {
|