diff --git a/src/main/java/com/ffii/tsms/modules/project/entity/projections/ProjectSearchInfo.kt b/src/main/java/com/ffii/tsms/modules/project/entity/projections/ProjectSearchInfo.kt index 9a45a96..9aa9687 100644 --- a/src/main/java/com/ffii/tsms/modules/project/entity/projections/ProjectSearchInfo.kt +++ b/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.code} - #{target.teamLead.team.name}") + val teamCodeName: String? + @get:Value("#{target.teamLead.team.id}") val teamId: Long? diff --git a/src/main/java/com/ffii/tsms/modules/project/service/InvoiceService.kt b/src/main/java/com/ffii/tsms/modules/project/service/InvoiceService.kt index 4119e5b..b3cc448 100644 --- a/src/main/java/com/ffii/tsms/modules/project/service/InvoiceService.kt +++ b/src/main/java/com/ffii/tsms/modules/project/service/InvoiceService.kt @@ -336,6 +336,7 @@ open class InvoiceService( val sql = StringBuilder( "select i.id, i.invoiceNo, i.projectCode, " + "p.name as projectName, t.code as team, i.invoiceDate, " + + " concat(t.code, ' - ', t.name) as teamCodeName, " + "i.receiptDate, i.issueAmount , i.paidAmount " + "from invoice i " + "left join project p on i.projectCode = p.code " +