|
|
@@ -77,19 +77,20 @@
|
|
|
select *,(t.signInStatus + t.signOutStatus + t.dailyStatus + t.weekStatus) as sort
|
|
|
from (
|
|
|
SELECT u.dept_id,u.serial_number,u.name,u.abbreviation,
|
|
|
- GROUP_CONCAT(u.serial_number) as number,GROUP_CONCAT(case when up.id is null then 0 else 1 end) as state,
|
|
|
+ GROUP_CONCAT(u.serial_number) as number,GROUP_CONCAT(case when up.unit_id is null then 0 else 1 end) as state,
|
|
|
case when si.status = '1' then 1 else 2 end as signInStatus,si.status as inStatus,date_format(si.time,'%H:%i:%s') as inTime,
|
|
|
case when so.status = '1' then 1 else 2 end as signOutStatus,so.status as outStatus,date_format(so.time,'%H:%i:%s') as outTime,
|
|
|
case when d.id is null then 2 else 1 end as dailyStatus,date_format(d.submit_time,'%H:%i:%s') as dailyTime,d.file_name as dailyName,d.file_url as dailyUrl,
|
|
|
case when w.id is null then 2 else 1 end as weekStatus,date_format(w.submit_time,'%H:%i:%s') as weekTime,w.file_name as weekName,w.file_url as weekUrl
|
|
|
FROM duty_seat_duty_unit u
|
|
|
- LEFT JOIN duty_seat_duty_unit_person up on u.id = up.unit_id and up.del_flag = 0
|
|
|
- <if test="accountIds != null and accountIds.size() != 0">
|
|
|
- and up.account_id in
|
|
|
- <foreach collection="accountIds" open="(" separator="," close=")" item="item">
|
|
|
- #{item}
|
|
|
- </foreach>
|
|
|
- </if>
|
|
|
+ LEFT JOIN (select distinct unit_id from duty_seat_duty_unit_person where del_flag = 0
|
|
|
+ <if test="accountIds != null and accountIds.size() != 0">
|
|
|
+ and account_id in
|
|
|
+ <foreach collection="accountIds" open="(" separator="," close=")" item="item">
|
|
|
+ #{item}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+ ) up on u.id = up.unit_id
|
|
|
LEFT JOIN duty_sign_in_record si on si.dept_id = u.dept_id and si.type = '1' and date_format(si.time,'%Y-%m-%d') = date_format(sysdate(),'%Y-%m-%d')
|
|
|
LEFT JOIN duty_sign_in_record so on so.dept_id = u.dept_id and so.type = '2' and date_format(so.time,'%Y-%m-%d') = date_format(sysdate(),'%Y-%m-%d')
|
|
|
LEFT JOIN duty_daily_report_record d on u.dept_id = d.dept_id and date_format(d.duty_time,'%Y-%m-%d') = date_format(sysdate(),'%Y-%m-%d')
|
