Browse Source

update api

tags/Baseline_30082024_BACKEND_UAT
Mac\David 1 year ago
parent
commit
bcb182d5bb
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt

+ 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"
+ " 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"


Loading…
Cancel
Save