From bcb182d5bbf0ad097ead42519e7f899a3603ad5e Mon Sep 17 00:00:00 2001 From: "Mac\\David" Date: Wed, 5 Jun 2024 14:39:44 +0800 Subject: [PATCH] update api --- .../com/ffii/tsms/modules/data/service/DashboardService.kt | 4 +++- 1 file changed, 3 insertions(+), 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 745e22f..8ef4048 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 @@ -1349,6 +1349,7 @@ open class DashboardService( + " AND dates.missing_date = ts.recordDate" + " WHERE" + " st.teamId = :teamId" + + " and st.deleted = 0" + " AND ts.recordDate IS NULL" + " GROUP BY" + " st.id," @@ -1403,6 +1404,7 @@ open class DashboardService( + " ON st.id = ts.staffId AND dates.missing_date = ts.recordDate" + " WHERE" + " st.teamId = :teamId" + + " and st.deleted = 0" + " AND ts.recordDate IS NULL" + " GROUP BY" + " st.id," @@ -1565,7 +1567,7 @@ open class DashboardService( + " left join project p on sa.project_id = p.id" + " left join timesheet t on p.id = t.projectId" + " where s.id = :staffId" - + " and t.recordDate >= :startdate" + + " and t.recordDate = :startdate" + " group by p.id, p.name" + " ) as result on result.pid = p2.id" + " where s2.id = :staffId"