|
@@ -132,12 +132,23 @@ public class ReportCalcService {
|
|
|
Cell tempCell = tempRow.getCell(k);
|
|
|
Cell mainTmpCell = null;
|
|
|
if (tempCell != null) {
|
|
|
- mainTmpCell = mainTmpRow.createCell(k);
|
|
|
switch (tempCell.getCellType()) {
|
|
|
- case STRING -> mainTmpCell.setCellValue(tempCell.getStringCellValue());
|
|
|
- case NUMERIC -> mainTmpCell.setCellValue(tempCell.getNumericCellValue());
|
|
|
- case FORMULA -> mainTmpCell.setCellFormula(tempCell.getCellFormula());
|
|
|
- default -> mainTmpCell.setCellValue("");
|
|
|
+ case STRING -> {
|
|
|
+ mainTmpCell = mainTmpRow.createCell(k,CellType.STRING);
|
|
|
+ mainTmpCell.setCellValue(tempCell.getStringCellValue());
|
|
|
+ }
|
|
|
+ case NUMERIC -> {
|
|
|
+ mainTmpCell = mainTmpRow.createCell(k,CellType.NUMERIC);
|
|
|
+ mainTmpCell.setCellValue(tempCell.getNumericCellValue());
|
|
|
+ }
|
|
|
+ case FORMULA -> {
|
|
|
+ mainTmpCell = mainTmpRow.createCell(k,CellType.FORMULA);
|
|
|
+ mainTmpCell.setCellFormula(tempCell.getCellFormula());
|
|
|
+ }
|
|
|
+ default -> {
|
|
|
+ mainTmpCell = mainTmpRow.createCell(k,CellType.STRING);
|
|
|
+ mainTmpCell.setCellValue("");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (thisCellNumModel.size() == 1) {
|