diff --git a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt index a9a6b25..d429f5f 100644 --- a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt +++ b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt @@ -2921,8 +2921,12 @@ open class ReportService( createCell(1).apply { setCellValue(team.code) - cellStyle = normalFontWithBorderStyle - CellUtil.setAlignment(this, HorizontalAlignment.CENTER) + + val cloneStyle = workbook.createCellStyle() + cloneStyle.cloneStyleFrom(normalFontWithBorderStyle) + cellStyle = cloneStyle.apply { + alignment = HorizontalAlignment.CENTER + } } } @@ -2939,8 +2943,11 @@ open class ReportService( sortedGrades.forEach { grade: Grade -> createCell(columnIndex++).apply { setCellValue(grade.name) - cellStyle = boldFontWithBorderStyle - CellUtil.setAlignment(this, HorizontalAlignment.CENTER) + val cloneStyle = workbook.createCellStyle() + cloneStyle.cloneStyleFrom(boldFontWithBorderStyle) + cellStyle = cloneStyle.apply { + alignment = HorizontalAlignment.CENTER + } } } @@ -2965,8 +2972,11 @@ open class ReportService( columnIndex = 0 createCell(columnIndex++).apply { setCellValue(chargedTeam.code) - cellStyle = normalFontWithBorderStyle - CellUtil.setAlignment(this, HorizontalAlignment.CENTER) + val cloneStyle = workbook.createCellStyle() + cloneStyle.cloneStyleFrom(normalFontWithBorderStyle) + cellStyle = cloneStyle.apply { + alignment = HorizontalAlignment.CENTER + } } var totalSalary = 0.0 @@ -2993,14 +3003,21 @@ open class ReportService( createCell(columnIndex++).apply { val lastCellLetter = CellReference.convertNumToColString(this.columnIndex - 1) cellFormula = "sum(B${this.rowIndex + 1}:${lastCellLetter}${this.rowIndex + 1})" - cellStyle = boldFontWithBorderStyle - cellStyle.dataFormat = accountingStyle + + val cloneStyle = workbook.createCellStyle() + cloneStyle.cloneStyleFrom(boldFontWithBorderStyle) + cellStyle = cloneStyle.apply { + dataFormat = accountingStyle + } } createCell(columnIndex).apply { setCellValue(totalSalary) - cellStyle = boldFontWithBorderStyle - cellStyle.dataFormat = accountingStyle + val cloneStyle = workbook.createCellStyle() + cloneStyle.cloneStyleFrom(boldFontWithBorderStyle) + cellStyle = cloneStyle.apply { + dataFormat = accountingStyle + } } } }