Commit 19b5382c authored by wujipeng's avatar wujipeng
Browse files

智能考评-学员成绩管理-导出优化·

parent 4f087901
......@@ -24,7 +24,9 @@ import org.apache.poi.ss.usermodel.IndexedColors;
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.SpreadsheetVersion;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
......@@ -75,7 +77,15 @@ public class ScoreAdminServiceImpl implements ScoreAdminService {
private static final String EXPORT_TEMPLATE_PATH = "templates/score-summary-template.xls";
private static final int EXPORT_STUDENTS_PER_SHEET = 27;
private static final int EXPORT_PROJECT_LIMIT = 5;
private static final int EXPORT_PROJECT_START_COLUMN = 4;
private static final int EXPORT_TEMPLATE_PROJECT_COUNT = 5;
private static final int EXPORT_TEMPLATE_REMARK_COLUMN = 9;
/**
* 旧版 .xls 仅支持256列;扣除项目列之前的4列和末尾备注列后,最多可容纳251个项目。
* 这是文件格式的技术边界,不是业务侧对项目数量的限制。
*/
private static final int EXPORT_MAX_PROJECT_COUNT =
SpreadsheetVersion.EXCEL97.getMaxColumns() - EXPORT_PROJECT_START_COLUMN - 1;
private static final int EXPORT_FIRST_STUDENT_ROW = 6;
private static final int EXPORT_SECOND_SECTION_ROW = 24;
private static final int EXPORT_FIRST_SECTION_SIZE = 16;
......@@ -430,7 +440,7 @@ public class ScoreAdminServiceImpl implements ScoreAdminService {
/**
* 项目定义来自实训上报的真实 code/title。相同编号出现不同非空标题说明源数据冲突;
* 超过五项则拒绝静默截断,因为模板没有第六个项目列。
* 项目数量不设业务上限,仅在超过旧版 .xls 的最大列数时拒绝导出。
*/
private PracticeExportData buildPracticeExportData(
List<ScoreAdminExportPracticeItemVO> items) {
......@@ -444,8 +454,9 @@ public class ScoreAdminServiceImpl implements ScoreAdminService {
}
String title = valueOrBlank(item.getTitle());
if (!projectTitles.containsKey(code)) {
if (projectTitles.size() >= EXPORT_PROJECT_LIMIT) {
throw new BusinessException("实训项目超过成绩汇总表最多5项的限制,无法导出");
if (projectTitles.size() >= EXPORT_MAX_PROJECT_COUNT) {
throw new BusinessException("实训项目超过.xls格式最多"
+ EXPORT_MAX_PROJECT_COUNT + "项的限制,无法导出");
}
projectTitles.put(code, title);
} else {
......@@ -493,19 +504,26 @@ public class ScoreAdminServiceImpl implements ScoreAdminService {
for (int page = 0; page < sheetCount; page++) {
Sheet sheet = workbook.getSheetAt(page);
workbook.setSheetName(page, page == 0 ? sheetBaseName : sheetBaseName + "-" + (page + 1));
writeSummarySheet(sheet, selectedExam, theoryExam, practiceExam,
writeSummarySheet(workbook, sheet, selectedExam, theoryExam, practiceExam,
students, practiceData, page);
}
workbook.setActiveSheet(0);
}
private void writeSummarySheet(Sheet sheet,
private void writeSummarySheet(HSSFWorkbook workbook,
Sheet sheet,
ScoreAdminExportExamVO selectedExam,
ScoreAdminExportExamVO theoryExam,
ScoreAdminExportExamVO practiceExam,
List<ExportStudent> students,
PracticeExportData practiceData,
int page) {
List<Map.Entry<String, String>> projects =
new ArrayList<>(practiceData.projectTitles.entrySet());
int projectColumnCount = Math.max(EXPORT_TEMPLATE_PROJECT_COUNT, projects.size());
int remarkColumn = EXPORT_PROJECT_START_COLUMN + projectColumnCount;
expandSummaryTemplate(workbook, sheet, projectColumnCount, remarkColumn);
writeText(sheet, 1, 1, String.valueOf(selectedExam.getClassId()));
writeText(sheet, 1, 5, combinedLocation(theoryExam, practiceExam));
writeText(sheet, 1, 8, "理论" + actualCount(theoryExam)
......@@ -514,19 +532,18 @@ public class ScoreAdminServiceImpl implements ScoreAdminService {
writeText(sheet, 2, 5, valueOrBlank(selectedExam.getLevelName()));
writeText(sheet, 2, 8, combinedDate(theoryExam, practiceExam));
List<Map.Entry<String, String>> projects =
new ArrayList<>(practiceData.projectTitles.entrySet());
for (int i = 0; i < EXPORT_PROJECT_LIMIT; i++) {
for (int i = 0; i < projectColumnCount; i++) {
writeText(sheet, 4, EXPORT_PROJECT_START_COLUMN + i, "项目" + (i + 1));
String label = i < projects.size()
? projects.get(i).getKey() + projects.get(i).getValue() : "";
writeText(sheet, 5, 4 + i, label);
writeText(sheet, 5, EXPORT_PROJECT_START_COLUMN + i, label);
}
for (int slot = 0; slot < EXPORT_STUDENTS_PER_SHEET; slot++) {
int globalIndex = page * EXPORT_STUDENTS_PER_SHEET + slot;
int rowIndex = templateStudentRow(slot);
if (globalIndex >= students.size()) {
clearStudentRow(sheet, rowIndex);
clearStudentRow(sheet, rowIndex, remarkColumn);
continue;
}
ExportStudent student = students.get(globalIndex);
......@@ -535,14 +552,152 @@ public class ScoreAdminServiceImpl implements ScoreAdminService {
writeScore(sheet, rowIndex, 2, scoreOf(student.theory));
writeScore(sheet, rowIndex, 3, scoreOf(student.practice));
Map<String, BigDecimal> studentProjectScores = practiceData.scores.get(student.studentId);
for (int i = 0; i < EXPORT_PROJECT_LIMIT; i++) {
for (int i = 0; i < projectColumnCount; i++) {
BigDecimal itemScore = null;
if (i < projects.size() && studentProjectScores != null) {
itemScore = studentProjectScores.get(projects.get(i).getKey());
}
writeScore(sheet, rowIndex, 4 + i, itemScore);
writeScore(sheet, rowIndex, EXPORT_PROJECT_START_COLUMN + i, itemScore);
}
writeText(sheet, rowIndex, remarkColumn, exportRemark(student));
}
}
/**
* 将固定五项目模板扩展为当前考试所需的动态列数。
*
* <p>模板的J列是备注列,新增项目必须插入到它之前。这里先把J列完整移动到新的备注列,
* 再以最后一个模板项目列(I列)为样式源创建额外项目列。这样标题、边框、字体、对齐方式
* 和列宽都与原模板一致,同时不会依赖POI对HSSF列移动的兼容性实现。</p>
*/
private void expandSummaryTemplate(HSSFWorkbook workbook, Sheet sheet,
int projectColumnCount, int remarkColumn) {
int extraProjectColumns = projectColumnCount - EXPORT_TEMPLATE_PROJECT_COUNT;
if (extraProjectColumns > 0) {
moveTemplateRemarkColumn(sheet, remarkColumn);
for (int column = EXPORT_TEMPLATE_REMARK_COLUMN; column < remarkColumn; column++) {
copyTemplateProjectColumn(sheet, column);
}
resizeTemplateMergedRegions(sheet, extraProjectColumns);
}
// 模板未预设打印区域;显式覆盖到动态备注列,确保新增项目不会被打印或预览截断。
int sheetIndex = workbook.getSheetIndex(sheet);
workbook.setPrintArea(sheetIndex, 0, remarkColumn, 0, sheet.getLastRowNum());
}
/** 把原J列的单元格、列宽和默认样式移动到动态备注列。 */
private void moveTemplateRemarkColumn(Sheet sheet, int targetColumn) {
copyColumnProperties(sheet, EXPORT_TEMPLATE_REMARK_COLUMN, targetColumn);
for (int rowIndex = 0; rowIndex <= sheet.getLastRowNum(); rowIndex++) {
Row row = sheet.getRow(rowIndex);
if (row == null) {
continue;
}
writeText(sheet, rowIndex, 9, exportRemark(student));
Cell source = row.getCell(EXPORT_TEMPLATE_REMARK_COLUMN);
if (source == null) {
continue;
}
Cell existingTarget = row.getCell(targetColumn);
if (existingTarget != null) {
row.removeCell(existingTarget);
}
Cell target = row.createCell(targetColumn);
copyCell(source, target);
row.removeCell(source);
}
}
/** 使用模板最后一个项目列的完整样式创建新增项目列。 */
private void copyTemplateProjectColumn(Sheet sheet, int targetColumn) {
int sourceColumn = EXPORT_TEMPLATE_REMARK_COLUMN - 1;
copyColumnProperties(sheet, sourceColumn, targetColumn);
for (int rowIndex = 0; rowIndex <= sheet.getLastRowNum(); rowIndex++) {
Row row = sheet.getRow(rowIndex);
if (row == null) {
continue;
}
Cell source = row.getCell(sourceColumn);
Cell target = row.getCell(targetColumn);
if (target == null) {
target = row.createCell(targetColumn);
}
if (source != null) {
target.setCellStyle(source.getCellStyle());
}
target.setBlank();
}
}
private void copyColumnProperties(Sheet sheet, int sourceColumn, int targetColumn) {
sheet.setColumnWidth(targetColumn, sheet.getColumnWidth(sourceColumn));
sheet.setColumnHidden(targetColumn, sheet.isColumnHidden(sourceColumn));
CellStyle defaultStyle = sheet.getColumnStyle(sourceColumn);
if (defaultStyle != null) {
sheet.setDefaultColumnStyle(targetColumn, defaultStyle);
}
}
/**
* 按“在原J列前插入项目列”的规则重映射合并区域:备注区域整体右移,跨J列的标题和
* 签字区域向右扩展,E4:I4的项目总表头单独扩展到最后一个项目列。
*/
private void resizeTemplateMergedRegions(Sheet sheet, int extraProjectColumns) {
List<CellRangeAddress> originalRegions = new ArrayList<>();
for (int i = 0; i < sheet.getNumMergedRegions(); i++) {
CellRangeAddress region = sheet.getMergedRegion(i);
originalRegions.add(new CellRangeAddress(region.getFirstRow(), region.getLastRow(),
region.getFirstColumn(), region.getLastColumn()));
}
for (int i = sheet.getNumMergedRegions() - 1; i >= 0; i--) {
sheet.removeMergedRegion(i);
}
for (CellRangeAddress region : originalRegions) {
int firstColumn = region.getFirstColumn();
int lastColumn = region.getLastColumn();
if (isTemplateProjectHeader(region)) {
lastColumn += extraProjectColumns;
} else if (firstColumn >= EXPORT_TEMPLATE_REMARK_COLUMN) {
firstColumn += extraProjectColumns;
lastColumn += extraProjectColumns;
} else if (lastColumn >= EXPORT_TEMPLATE_REMARK_COLUMN) {
lastColumn += extraProjectColumns;
}
sheet.addMergedRegion(new CellRangeAddress(region.getFirstRow(), region.getLastRow(),
firstColumn, lastColumn));
}
}
private boolean isTemplateProjectHeader(CellRangeAddress region) {
return region.getFirstRow() == 3 && region.getLastRow() == 3
&& region.getFirstColumn() == EXPORT_PROJECT_START_COLUMN
&& region.getLastColumn() == EXPORT_TEMPLATE_REMARK_COLUMN - 1;
}
/** 复制备注单元格时保留模板值、公式、样式及错误状态。 */
private void copyCell(Cell source, Cell target) {
target.setCellStyle(source.getCellStyle());
switch (source.getCellType()) {
case STRING:
target.setCellValue(source.getRichStringCellValue());
break;
case NUMERIC:
target.setCellValue(source.getNumericCellValue());
break;
case BOOLEAN:
target.setCellValue(source.getBooleanCellValue());
break;
case FORMULA:
target.setCellFormula(source.getCellFormula());
break;
case ERROR:
target.setCellErrorValue(source.getErrorCellValue());
break;
case BLANK:
default:
target.setBlank();
break;
}
}
......@@ -552,8 +707,8 @@ public class ScoreAdminServiceImpl implements ScoreAdminService {
: EXPORT_SECOND_SECTION_ROW + slot - EXPORT_FIRST_SECTION_SIZE;
}
private void clearStudentRow(Sheet sheet, int rowIndex) {
for (int column = 0; column < 10; column++) {
private void clearStudentRow(Sheet sheet, int rowIndex, int remarkColumn) {
for (int column = 0; column <= remarkColumn; column++) {
cell(sheet, rowIndex, column).setBlank();
}
}
......
......@@ -92,7 +92,9 @@ JWT解析当前用户并校验 `phone_role.role_name=管理员`。本模块只
单场汇总表响应类型为 `application/vnd.ms-excel`,文件名为“班级名称_成绩汇总表.xls”。名单
取两场应考学员并集,缺考或未列入另一场名单时对应成绩留空并写入备注;实训项目按实际
编号与标题动态填充,最多5项。每27名学员生成一张同版式分表,序号跨分表连续。
编号与标题动态填充,超过模板初始的5项时继续向右扩展,备注列同步顺延。受旧版 `.xls`
最多256列的格式限制,单次导出最多支持251个实训项目。每27名学员生成一张同版式分表,
序号跨分表连续。
班级历史导出继续返回 `.xlsx`。两类文件名均通过 RFC 5987 UTF-8 编码。
......
......@@ -15,6 +15,8 @@ import com.platform.business.model.vo.ScoreAdminStudentVO;
import com.platform.business.service.ExamAdminService;
import com.platform.exception.BusinessException;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellRangeAddress;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
......@@ -345,6 +347,8 @@ class ScoreAdminServiceImplTest {
assertEquals(91D, workbook.getSheetAt(0).getRow(6).getCell(3).getNumericCellValue());
assertEquals(20D, workbook.getSheetAt(0).getRow(6).getCell(4).getNumericCellValue());
assertEquals("李四", text(workbook, 0, 7, 1));
assertEquals(org.apache.poi.ss.usermodel.CellType.BLANK,
workbook.getSheetAt(0).getRow(7).getCell(5).getCellType());
assertEquals("未列入理论应考名单", text(workbook, 0, 7, 9));
assertEquals("考评员签字", text(workbook, 0, 22, 0));
}
......@@ -426,7 +430,11 @@ class ScoreAdminServiceImplTest {
String.valueOf(100 - i), true, true));
}
when(scoreAdminMapper.queryExportCandidates(1)).thenReturn(candidates);
when(scoreAdminMapper.queryExportPracticeItems(1)).thenReturn(Collections.emptyList());
List<ScoreAdminExportPracticeItemVO> items = new ArrayList<>();
for (int i = 1; i <= 6; i++) {
items.add(practiceItem("student-28", "P" + i, "项目" + i, String.valueOf(i)));
}
when(scoreAdminMapper.queryExportPracticeItems(1)).thenReturn(items);
MockHttpServletResponse response = new MockHttpServletResponse();
service.exportExam(1, response);
......@@ -440,6 +448,9 @@ class ScoreAdminServiceImplTest {
assertEquals("学员27", text(workbook, 0, 34, 1));
assertEquals(28D, workbook.getSheetAt(1).getRow(6).getCell(0).getNumericCellValue());
assertEquals("学员28", text(workbook, 1, 6, 1));
assertEquals("P6项目6", text(workbook, 1, 5, 9));
assertEquals(6D, workbook.getSheetAt(1).getRow(6).getCell(9).getNumericCellValue());
assertEquals("未列入理论应考名单", text(workbook, 1, 6, 10));
assertEquals(org.apache.poi.ss.usermodel.CellType.BLANK,
workbook.getSheetAt(1).getRow(7).getCell(0).getCellType());
assertEquals("督导员签字", text(workbook, 1, 36, 0));
......@@ -447,7 +458,7 @@ class ScoreAdminServiceImplTest {
}
@Test
void exportExamShouldRejectMoreThanFivePracticeProjects() {
void exportExamShouldExpandTemplateForMoreThanFivePracticeProjects() throws Exception {
ScoreAdminExportExamVO practiceExam = endedExportExam(1, 10, "实训");
when(scoreAdminMapper.findExportExam(1)).thenReturn(practiceExam);
when(scoreAdminMapper.queryExportCandidates(1)).thenReturn(Collections.singletonList(
......@@ -457,11 +468,61 @@ class ScoreAdminServiceImplTest {
items.add(practiceItem("student-1", "P" + i, "项目" + i, "10"));
}
when(scoreAdminMapper.queryExportPracticeItems(1)).thenReturn(items);
MockHttpServletResponse response = new MockHttpServletResponse();
service.exportExam(1, response);
try (HSSFWorkbook workbook = new HSSFWorkbook(
new ByteArrayInputStream(response.getContentAsByteArray()))) {
Sheet sheet = workbook.getSheetAt(0);
assertEquals("项目6", text(workbook, 0, 4, 9));
assertEquals("P6项目6", text(workbook, 0, 5, 9));
assertEquals(10D, sheet.getRow(6).getCell(9).getNumericCellValue());
assertEquals("未列入理论应考名单", text(workbook, 0, 6, 10));
assertEquals(sheet.getColumnWidth(8), sheet.getColumnWidth(9));
assertEquals(sheet.getRow(6).getCell(8).getCellStyle().getIndex(),
sheet.getRow(6).getCell(9).getCellStyle().getIndex());
assertTrue(hasMergedRegion(sheet, "E4:J4"));
assertTrue(hasMergedRegion(sheet, "K4:K6"));
assertTrue(hasMergedRegion(sheet, "A1:K1"));
assertTrue(hasMergedRegion(sheet, "D23:K23"));
assertEquals("'2026年'!$A$1:$K$49", workbook.getPrintArea(0));
}
}
@Test
void exportExamShouldSupportMaximumXlsProjectColumns() throws Exception {
ScoreAdminExportExamVO practiceExam = endedExportExam(1, 10, "实训");
when(scoreAdminMapper.findExportExam(1)).thenReturn(practiceExam);
when(scoreAdminMapper.queryExportCandidates(1)).thenReturn(Collections.singletonList(
exportStudent("student-1", "张三", "90", true, true)));
List<ScoreAdminExportPracticeItemVO> items = practiceItems(251);
when(scoreAdminMapper.queryExportPracticeItems(1)).thenReturn(items);
MockHttpServletResponse response = new MockHttpServletResponse();
service.exportExam(1, response);
try (HSSFWorkbook workbook = new HSSFWorkbook(
new ByteArrayInputStream(response.getContentAsByteArray()))) {
Sheet sheet = workbook.getSheetAt(0);
assertEquals("P251项目251", text(workbook, 0, 5, 254));
assertEquals("未列入理论应考名单", text(workbook, 0, 6, 255));
assertEquals("'2026年'!$A$1:$IV$49", workbook.getPrintArea(0));
}
}
@Test
void exportExamShouldRejectProjectsBeyondXlsColumnLimit() {
ScoreAdminExportExamVO practiceExam = endedExportExam(1, 10, "实训");
when(scoreAdminMapper.findExportExam(1)).thenReturn(practiceExam);
when(scoreAdminMapper.queryExportCandidates(1)).thenReturn(Collections.singletonList(
exportStudent("student-1", "张三", "90", true, true)));
when(scoreAdminMapper.queryExportPracticeItems(1)).thenReturn(practiceItems(252));
BusinessException error = assertThrows(BusinessException.class,
() -> service.exportExam(1, new MockHttpServletResponse()));
assertEquals("实训项目超过成绩汇总表最多5项的限制,无法导出", error.getMessage());
assertEquals("实训项目超过.xls格式最多251项的限制,无法导出", error.getMessage());
}
@Test
......@@ -541,6 +602,25 @@ class ScoreAdminServiceImplTest {
return item;
}
/** 按编号顺序构造指定数量的实训项目,用于验证动态列及.xls格式边界。 */
private List<ScoreAdminExportPracticeItemVO> practiceItems(int count) {
List<ScoreAdminExportPracticeItemVO> items = new ArrayList<>();
for (int i = 1; i <= count; i++) {
items.add(practiceItem("student-1", "P" + i, "项目" + i, "10"));
}
return items;
}
private boolean hasMergedRegion(Sheet sheet, String address) {
CellRangeAddress expected = CellRangeAddress.valueOf(address);
for (int i = 0; i < sheet.getNumMergedRegions(); i++) {
if (expected.equals(sheet.getMergedRegion(i))) {
return true;
}
}
return false;
}
private String text(HSSFWorkbook workbook, int sheet, int row, int column) {
return workbook.getSheetAt(sheet).getRow(row).getCell(column).getStringCellValue();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment