|
|
@@ -21,15 +21,15 @@ public class ExportUtils {
|
|
|
/**
|
|
|
* 创建合并单元格的表头(模拟模板中的"正常订单"标题)
|
|
|
*/
|
|
|
- public static void createMergedHeader(Sheet sheet, CellStyle headerStyle,String headerName) {
|
|
|
+ public static void createMergedHeader(Sheet sheet, CellStyle headerStyle,String headerName,int lastCol) {
|
|
|
// 第一行:主标题
|
|
|
Row titleRow = sheet.createRow(0);
|
|
|
Cell titleCell = titleRow.createCell(0);
|
|
|
titleCell.setCellValue(headerName);
|
|
|
titleCell.setCellStyle(headerStyle);
|
|
|
|
|
|
- // 合并A1到R1单元格
|
|
|
- sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 17));
|
|
|
+ // 合并单元格
|
|
|
+ sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, lastCol));
|
|
|
|
|
|
// 设置行高
|
|
|
titleRow.setHeightInPoints(25);
|