From c9898d476632c66ccc75f7a0dc074d7f2e9ef021 Mon Sep 17 00:00:00 2001 From: "MSI\\User" Date: Thu, 29 Aug 2024 15:03:03 +0800 Subject: [PATCH] added projectId --- .../java/com/ffii/tsms/modules/data/service/DashboardService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt index 3c21eca..3058f97 100644 --- a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt +++ b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt @@ -1531,7 +1531,7 @@ open class DashboardService( + " left join salary_effective se on t.recordDate >= se.`date` and s.id = se.staffId" + " left join salary s2 on se.salaryId = s2.salaryPoint" + " where t.id is not null" - + " and p.id in (1)" + + " and p.id in (:projectIds)" + " and year(t.recordDate) < :year" + " group by t.id, s.id, se.id, se.salaryId,se.date, s2.hourlyRate" + " ) as se"