|
@@ -785,7 +785,7 @@ open class DashboardService( |
|
|
+ " left join (" |
|
|
+ " left join (" |
|
|
+ " select" |
|
|
+ " select" |
|
|
+ " t4.id as teamId," |
|
|
+ " t4.id as teamId," |
|
|
+ " sum(pe.amount) as amount" |
|
|
|
|
|
|
|
|
+ " COALESCE(sum(pe.amount),0) as amount" |
|
|
+ " from team t4" |
|
|
+ " from team t4" |
|
|
+ " left join project p4 on t4.teamLead = p4.teamLead" |
|
|
+ " left join project p4 on t4.teamLead = p4.teamLead" |
|
|
+ " left join project_expense pe on pe.projectId = p4.id" |
|
|
+ " left join project_expense pe on pe.projectId = p4.id" |
|
@@ -929,7 +929,7 @@ open class DashboardService( |
|
|
+ " ) as expenditure on 1=1." |
|
|
+ " ) as expenditure on 1=1." |
|
|
+ " left join (" |
|
|
+ " left join (" |
|
|
+ " select" |
|
|
+ " select" |
|
|
+ " sum(pe.amount) as amount" |
|
|
|
|
|
|
|
|
+ " COALESCE(sum(pe.amount),0) as amount" |
|
|
+ " from project p4" |
|
|
+ " from project p4" |
|
|
+ " left join project_expense pe on pe.projectId = p4.id" |
|
|
+ " left join project_expense pe on pe.projectId = p4.id" |
|
|
+ " where p4.status = 'On-going'" |
|
|
+ " where p4.status = 'On-going'" |
|
|