Quellcode durchsuchen

update cash flow report

tags/Baseline_30082024_BACKEND_UAT
cyril.tsui vor 1 Jahr
Ursprung
Commit
e28b86c464
1 geänderte Dateien mit 5 neuen und 2 gelöschten Zeilen
  1. +5
    -2
      src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt

+ 5
- 2
src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt Datei anzeigen

@@ -755,11 +755,12 @@ open class ReportService(
}

val groupedInvoices = invoices.sortedBy { it.receiptDate }.filter { it.paidAmount != null }
.groupBy { invoiceEntry -> invoiceEntry.invoiceDate?.format(dateFormatter).toString() }
.groupBy { invoiceEntry -> invoiceEntry.receiptDate?.format(dateFormatter).toString() }
.mapValues { (_, invoiceEntries) ->
invoiceEntries.map { invoice ->
mapOf(
"paidAmount" to invoice.paidAmount?.toDouble(),
"invoiceNo" to invoice.invoiceNo,
"description" to invoice.milestonePayment?.description
)
}
@@ -815,7 +816,8 @@ open class ReportService(
}

createCell(4)?.apply {
setCellValue(invoice["description"].toString())
// setCellValue(invoice["description"].toString())
setCellValue("Invoice Receipt: " + (invoice["invoiceNo"] ?: "N/A").toString())
}
}
}
@@ -857,6 +859,7 @@ open class ReportService(
}
}
}

}

return workbook


Laden…
Abbrechen
Speichern