|
|
|
@@ -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 { |
|
|
|
|