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 c9ef745..15257cc 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 @@ -558,7 +558,7 @@ open class ReportService( val totalFeeCell = row.createCell(8) val totalFee = - (item["expectedTotalFee"]?.let { it as Double } ?: 0.0) + (item["expectedTotalFee"]?.let { it as Double } ?: 0.0) - (item["subContractFee"]?.let { it as Double } ?: 0.0) totalFeeCell.apply { setCellValue(totalFee) cellStyle.dataFormat = accountingStyle @@ -567,7 +567,7 @@ open class ReportService( // val fee = (item["expectedTotalFee"]?.let { it as Double } ?: 0.0) - (item["subContractFee"]?.let { it as Double } // ?: 0.0) - val fee = (item["expectedTotalFee"]?.let { it as Double } ?: 0.0) + val fee = (item["expectedTotalFee"]?.let { it as Double } ?: 0.0) - (item["subContractFee"]?.let { it as Double } ?: 0.0) val budgetCell = row.createCell(9) budgetCell.apply {