|
|
@@ -1039,10 +1039,10 @@ open class ReportService( |
|
|
|
|
|
|
|
|
open fun getFinancialStatus(projectId: Long?): List<Map<String, Any>> { |
|
|
open fun getFinancialStatus(projectId: Long?): List<Map<String, Any>> { |
|
|
val sql = StringBuilder( |
|
|
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 ," |
|
|
+ " 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," |
|
|
+ " s.name , IFNULL(t.normalConsumed, 0) as normalConsumed, IFNULL(t.otConsumed , 0) as otConsumed, s2.hourlyRate," |
|
|
|
