|
|
@@ -3476,8 +3476,8 @@ open class DashboardService( |
|
|
|
+ " left join project p on p.code = i.projectCode " |
|
|
|
+ " left join staff s on s.id = p.teamlead " |
|
|
|
+ " where i.deleted = false " |
|
|
|
+ (if (args.containsKey("startDate") && args.containsKey("endDate")) " and i.receiptDate between :startDate AND :endDate " |
|
|
|
else if (args.containsKey("endDate")) " and i.receiptDate <= :endDate " |
|
|
|
+ (if (args.containsKey("startDate") && args.containsKey("endDate")) " and i.invoiceDate between :startDate AND :endDate " |
|
|
|
else if (args.containsKey("endDate")) " and i.invoiceDate <= :endDate " |
|
|
|
else "") |
|
|
|
+ " group by p.id " |
|
|
|
+ " ) " |
|
|
|