|
@@ -40,6 +40,7 @@ import org.apache.poi.ss.usermodel.Row;
|
|
|
import org.apache.poi.ss.usermodel.Sheet;
|
|
|
import org.apache.poi.ss.usermodel.VerticalAlignment;
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
+import org.apache.poi.ss.util.CellRangeAddress;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -193,7 +194,7 @@ public class ExamSubjectScoreServiceImpl extends MPJBaseServiceImpl<ExamSubjectS
|
|
|
String sheetName = "数据";
|
|
|
Sheet sheet = workbook.createSheet(sheetName);
|
|
|
|
|
|
- createFirstTitle(workbook, sheet, semesterService.getById(dto.getSemesterId()), examPlanService.getById(dto.getExamPlanId()));
|
|
|
+ createFirstTitle(workbook, sheet, semesterService.getById(dto.getSemesterId()), examPlanService.getById(dto.getExamPlanId()), titleList);
|
|
|
|
|
|
createTitle(workbook, sheet, titleList);
|
|
|
|
|
@@ -265,7 +266,7 @@ public class ExamSubjectScoreServiceImpl extends MPJBaseServiceImpl<ExamSubjectS
|
|
|
return bot.toByteArray();
|
|
|
}
|
|
|
|
|
|
- void createFirstTitle(Workbook workbook, Sheet sheet, BaseSemester semester, ExamPlan examPlan) {
|
|
|
+ void createFirstTitle(Workbook workbook, Sheet sheet, BaseSemester semester, ExamPlan examPlan, List<ClassStudentScoreTitleVo> titleList) {
|
|
|
int rowNumber = 0;
|
|
|
Font font = workbook.createFont();
|
|
|
font.setBold(true);// 设置为粗体
|
|
@@ -280,14 +281,15 @@ public class ExamSubjectScoreServiceImpl extends MPJBaseServiceImpl<ExamSubjectS
|
|
|
|
|
|
Row row = sheet.createRow(rowNumber);
|
|
|
|
|
|
- int cellNumber = 1;
|
|
|
+ int cellNumber = 0;
|
|
|
Cell cell = row.createCell(cellNumber);
|
|
|
cell.setCellValue(semester.getName() + "-" + examPlan.getName());
|
|
|
cell.setCellStyle(cellStyle);
|
|
|
+ sheet.addMergedRegion(new CellRangeAddress(0, 0, cellNumber, cellNumber + 8 + titleList.size() - 1));
|
|
|
}
|
|
|
|
|
|
void createTitle(Workbook workbook, Sheet sheet, List<ClassStudentScoreTitleVo> titleList) {
|
|
|
- int rowNumber = 0;
|
|
|
+ int rowNumber = 1;
|
|
|
Font font = workbook.createFont();
|
|
|
font.setBold(true);// 设置为粗体
|
|
|
font.setFontName("宋体");
|
|
@@ -301,7 +303,7 @@ public class ExamSubjectScoreServiceImpl extends MPJBaseServiceImpl<ExamSubjectS
|
|
|
|
|
|
Row row = sheet.createRow(rowNumber);
|
|
|
|
|
|
- int cellNumber = 1;
|
|
|
+ int cellNumber = 0;
|
|
|
Cell cell = row.createCell(cellNumber);
|
|
|
cell.setCellValue("序号");
|
|
|
cell.setCellStyle(cellStyle);
|