From 56ddcadbf80eee7ff4042e5703d32173d26095f6 Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Thu, 16 May 2024 20:58:00 +0800 Subject: [PATCH] update --- .../com/ffii/tsms/modules/report/service/ReportService.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 1c01f2b..1194886 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 @@ -1039,10 +1039,10 @@ open class ReportService( open fun getFinancialStatus(projectId: Long?): List> { val sql = StringBuilder( - "with cte_invoice as (select p.code, sum(i.issueAmount) as sumIssuedAmount , sum(i.paidAmount) as sumPaidAmount" - + "from invoice i" - + "left join project p on p.code = i.projectCode" - + "group by p.code" + " with cte_invoice as (select p.code, sum(i.issueAmount) as sumIssuedAmount , sum(i.paidAmount) as sumPaidAmount" + + " from invoice i" + + " left join project p on p.code = i.projectCode" + + " group by p.code" + ")" + " Select p.code, p.description, c.name, t2.name, p.planStart , p.planEnd , p.expectedTotalFee ," + " s.name , IFNULL(t.normalConsumed, 0) as normalConsumed, IFNULL(t.otConsumed , 0) as otConsumed, s2.hourlyRate,"