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