|
@@ -682,15 +682,15 @@ public class ExportController extends BaseController {
|
|
|
} else {
|
|
|
row.setHomeWorkReplied(null);
|
|
|
}
|
|
|
- if (row.getReviewId() != null && row.getAttendanceId() != null) {
|
|
|
+ if (row.getAttendanceId() != null) {
|
|
|
row.setAttendanceStr("是");
|
|
|
- } else if (row.getReviewId() != null && row.getAttendanceId() == null) {
|
|
|
+ } else {
|
|
|
row.setAttendanceStr("否");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- String[] header = {"分部", "上课日期", "学生编号", "课程编号","学员是否到课", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期(布置作业)", "完成app双向沟通", "是否提交作业", "是否回复作业", "教务老师", "教务评价"};
|
|
|
- String[] body = {"organName", "classDateStr", "studentId", "id","attendanceStr", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "hasLiaison", "handHomeworkStr", "homeWorkReplied", "eduTeacherName", "courseReview"};
|
|
|
+ String[] header = {"分部", "上课日期", "学生编号", "课程编号", "学员是否到课", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期(布置作业)", "完成app双向沟通", "是否提交作业", "是否回复作业", "教务老师", "教务评价"};
|
|
|
+ String[] body = {"organName", "classDateStr", "studentId", "id", "attendanceStr", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "hasLiaison", "handHomeworkStr", "homeWorkReplied", "eduTeacherName", "courseReview"};
|
|
|
HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupReviews.getRows());
|
|
|
response.setContentType("application/octet-stream");
|
|
|
response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
|