|
@@ -63,8 +63,8 @@
|
|
|
or (b.rule_type = 2 and b.attendance_count < 2 and b.shift_real_time_s is not null)
|
|
|
or (b.rule_type = 2 and b.shift_real_time_s is not null and b.goto_time is null)
|
|
|
or (b.duration is not null and b.work_overtime > 0)
|
|
|
- and b.set_info > 0 and b.error_state is not null
|
|
|
- )
|
|
|
+ and b.set_info > 0 ) and b.error_state is null
|
|
|
+
|
|
|
|
|
|
group by b.username,b.depart_names
|
|
|
|
|
@@ -98,8 +98,8 @@
|
|
|
or (b.rule_type = 2 and b.attendance_count < 2 and b.shift_real_time_s is not null)
|
|
|
or (b.rule_type = 2 and b.shift_real_time_s is not null and b.goto_time is null)
|
|
|
or (b.duration is not null and b.work_overtime > 0)
|
|
|
- and b.set_info > 0 and b.error_state is not null
|
|
|
- )
|
|
|
+ and b.set_info > 0 ) and b.error_state is null
|
|
|
+
|
|
|
|
|
|
group by b.username
|
|
|
) B
|