diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/ImageExcelHandler.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/ImageExcelHandler.java index 75fdb291a..452791586 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/ImageExcelHandler.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/ImageExcelHandler.java @@ -58,7 +58,8 @@ public class ImageExcelHandler { // 创建标题行 Row headerRow = sheet.createRow(0); headerRow.setHeight((short) (30 * 20)); // 设置标题行高 - String[] headers = {"进仓单号", "进仓子单号", "运单号", "订单号", "进仓时间", "件数", "重量", "体积", "快递公司", "快递单号", "品名", "供应商", "图片"}; + String[] headers = { "进仓单号", "进仓子单号", "运单号", "订单号", "进仓时间", "件数", "重量", "体积", "快递公司", "快递单号", "品名", "供应商", + "图片" }; // 创建标题单元格 for (int i = 0; i < headers.length; i++) { @@ -150,23 +151,25 @@ public class ImageExcelHandler { } // 合并图片列的表头 - CellRangeAddress mergedRegion = new CellRangeAddress( - 0, // 起始行 - 0, // 结束行 - IMAGE_COLUMN_START, // 起始列 - IMAGE_COLUMN_START + maxImageCount - 1 // 结束列 - ); - sheet.addMergedRegion(mergedRegion); + if (maxImageCount > 1) { + CellRangeAddress mergedRegion = new CellRangeAddress( + 0, // 起始行 + 0, // 结束行 + IMAGE_COLUMN_START, // 起始列 + IMAGE_COLUMN_START + maxImageCount - 1 // 结束列 + ); + sheet.addMergedRegion(mergedRegion); - // 为合并后的单元格设置边框 - RegionUtil.setBorderTop(BorderStyle.MEDIUM, mergedRegion, sheet); - RegionUtil.setBorderBottom(BorderStyle.MEDIUM, mergedRegion, sheet); - RegionUtil.setBorderLeft(BorderStyle.MEDIUM, mergedRegion, sheet); - RegionUtil.setBorderRight(BorderStyle.MEDIUM, mergedRegion, sheet); - RegionUtil.setBottomBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, sheet); - RegionUtil.setTopBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, sheet); - RegionUtil.setLeftBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, sheet); - RegionUtil.setRightBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, sheet); + // 为合并后的单元格设置边框 + RegionUtil.setBorderTop(BorderStyle.MEDIUM, mergedRegion, sheet); + RegionUtil.setBorderBottom(BorderStyle.MEDIUM, mergedRegion, sheet); + RegionUtil.setBorderLeft(BorderStyle.MEDIUM, mergedRegion, sheet); + RegionUtil.setBorderRight(BorderStyle.MEDIUM, mergedRegion, sheet); + RegionUtil.setBottomBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, sheet); + RegionUtil.setTopBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, sheet); + RegionUtil.setLeftBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, sheet); + RegionUtil.setRightBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, sheet); + } // 写入到字节数组 ByteArrayOutputStream outputStream = new ByteArrayOutputStream();