1 changed files with 3 additions and 1 deletions
Unified View
Diff Options
+ 3
- 1
src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
View File
| @@ -1349,6 +1349,7 @@ open class DashboardService( | |||||
| + " AND dates.missing_date = ts.recordDate" | + " AND dates.missing_date = ts.recordDate" | ||||
| + " WHERE" | + " WHERE" | ||||
| + " st.teamId = :teamId" | + " st.teamId = :teamId" | ||||
| + " and st.deleted = 0" | |||||
| + " AND ts.recordDate IS NULL" | + " AND ts.recordDate IS NULL" | ||||
| + " GROUP BY" | + " GROUP BY" | ||||
| + " st.id," | + " st.id," | ||||
| @@ -1403,6 +1404,7 @@ open class DashboardService( | |||||
| + " ON st.id = ts.staffId AND dates.missing_date = ts.recordDate" | + " ON st.id = ts.staffId AND dates.missing_date = ts.recordDate" | ||||
| + " WHERE" | + " WHERE" | ||||
| + " st.teamId = :teamId" | + " st.teamId = :teamId" | ||||
| + " and st.deleted = 0" | |||||
| + " AND ts.recordDate IS NULL" | + " AND ts.recordDate IS NULL" | ||||
| + " GROUP BY" | + " GROUP BY" | ||||
| + " st.id," | + " st.id," | ||||
| @@ -1565,7 +1567,7 @@ open class DashboardService( | |||||
| + " left join project p on sa.project_id = p.id" | + " left join project p on sa.project_id = p.id" | ||||
| + " left join timesheet t on p.id = t.projectId" | + " left join timesheet t on p.id = t.projectId" | ||||
| + " where s.id = :staffId" | + " where s.id = :staffId" | ||||
| + " and t.recordDate >= :startdate" | |||||
| + " and t.recordDate = :startdate" | |||||
| + " group by p.id, p.name" | + " group by p.id, p.name" | ||||
| + " ) as result on result.pid = p2.id" | + " ) as result on result.pid = p2.id" | ||||
| + " where s2.id = :staffId" | + " where s2.id = :staffId" | ||||