|
@@ -1555,8 +1555,8 @@ open class DashboardService( |
|
|
+ " coalesce(sum(i.paidAmount),0) as income" |
|
|
+ " coalesce(sum(i.paidAmount),0) as income" |
|
|
+ " from project p" |
|
|
+ " from project p" |
|
|
+ " left join invoice i on p.code = i.projectCode and i.deleted = 0 where p.status = 'On-going'" |
|
|
+ " left join invoice i on p.code = i.projectCode and i.deleted = 0 where p.status = 'On-going'" |
|
|
+ " and p.id in (1)" |
|
|
|
|
|
+ " and year(i.receiptDate) < 2025" |
|
|
|
|
|
|
|
|
+ " and p.id in (:projectIds)" |
|
|
|
|
|
+ " and year(i.receiptDate) < :year" |
|
|
+ " and i.id is not null" |
|
|
+ " and i.id is not null" |
|
|
+ " group by month(i.receiptDate)" |
|
|
+ " group by month(i.receiptDate)" |
|
|
+ " ) as result" |
|
|
+ " ) as result" |
|
|