Merge branch 'master' of https://git.2fi-solutions.com/davidhui/TSMS-backend

src/main/java/com/ffii/tsms/modules/project/entity/projections/ProjectSearchInfo.kt

@@ -20,6 +20,9 @@ interface ProjectSearchInfo {
     @get:Value("#{target.teamLead.team.code}")
     val team: String?
 
+    @get:Value("#{target.teamLead.team.id}")
+    val teamId: Long?
+
     @get:Value("#{target.customer.name}")
     val client: String?
 }

src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt

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