Kaynağa Gözat

!30 支持非String格式单元格合并

Merge pull request !30 from Jkanon/master
4.1.3.A
jueyue 6 yıl önce
committed by Gitee
ebeveyn
işleme
4ab10a62b0
2 değiştirilmiş dosya ile 11 ekleme ve 5 silme
  1. +8
    -2
      easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/base/BaseExportService.java
  2. +3
    -3
      easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiMergeCellUtil.java

+ 8
- 2
easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/base/BaseExportService.java Dosyayı Görüntüle

@@ -280,10 +280,16 @@ public abstract class BaseExportService extends ExportCommonService {
public void createDoubleCell(Row row, int index, String text, CellStyle style,
ExcelExportEntity entity) {
Cell cell = row.createCell(index);
cell.setCellType(CellType.NUMERIC);
if (text != null && text.length() > 0) {
cell.setCellValue(Double.parseDouble(text));
try {
cell.setCellValue(Double.parseDouble(text));
} catch (NumberFormatException e) {
cell.setCellType(Cell.CELL_TYPE_STRING);
cell.setCellValue(text);
}
}
cell.setCellType(CellType.NUMERIC);
if (style != null) {
cell.setCellStyle(style);
}


+ 3
- 3
easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiMergeCellUtil.java Dosyayı Görüntüle

@@ -87,7 +87,7 @@ public final class PoiMergeCellUtil {
mergeDataMap.get(index).setEndRow(i - 1);
}
} else {
text = row.getCell(index).getStringCellValue();
text = PoiCellUtil.getCellValue(row.getCell(index));
if (StringUtils.isNotEmpty(text)) {
handlerMergeCells(index, i, text, mergeDataMap, sheet, row.getCell(index),
mergeMap.get(index));
@@ -203,8 +203,8 @@ public final class PoiMergeCellUtil {
return null;
}
if (cell.getRow().getCell(index) != null
&& StringUtils.isNotEmpty(cell.getRow().getCell(index).getStringCellValue())) {
return cell.getRow().getCell(index).getStringCellValue();
&& StringUtils.isNotEmpty(PoiCellUtil.getCellValue(cell.getRow().getCell(index)))) {
return PoiCellUtil.getCellValue(cell.getRow().getCell(index));
}
return getCellNotNullText(cell.getRow().getSheet().getRow(--rowNum).getCell(index), index,
rowNum);


Yükleniyor…
İptal
Kaydet