|
@@ -1220,8 +1220,7 @@
|
|
|
(select allday from time_type te
|
|
|
where te.company_id=#{companyId}) as allday,
|
|
|
(select SUM(report.working_time) from report
|
|
|
- left join task on task.id=report.task_id
|
|
|
- where report.creator_id=us.id and task_id is not null and report.state=1
|
|
|
+ where report.creator_id=us.id and report.state=1
|
|
|
and report.create_date >=#{startDate} and report.create_date <=#{endDate})
|
|
|
as workingTime,
|
|
|
(select SUM(leave_sheet.time_hours) from leave_sheet
|