|
|
@@ -911,7 +911,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
( latest.is_pause_time = 0 AND t.pause_time IS NULL AND t.real_start_time = latest.latest_time ) )
|
|
|
LEFT JOIN sys_dept d ON d.dept_id=t.pcs_station_pid
|
|
|
WHERE
|
|
|
- latest.pcs_device_id IS NOT NULL
|
|
|
+ latest.pcs_device_id IS NOT NULL AND t.work_order_status IN ('completed','archived')
|
|
|
AND t.restart_time IS NOT NULL
|
|
|
<if test="deptName != null and deptName != ''"> and d.dept_name like concat('%', #{deptName}, '%')</if>
|
|
|
<if test="pcsStationName != null and pcsStationName != ''"> and t.pcs_station_name like concat('%', #{pcsStationName}, '%')</if>
|
|
|
@@ -950,7 +950,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
AND t.occur_time = latest.latest_pause_time
|
|
|
LEFT JOIN sys_dept d ON d.dept_id=t.pcs_station_pid
|
|
|
WHERE
|
|
|
- t.occur_time IS NOT NULL
|
|
|
+ t.occur_time IS NOT NULL AND t.work_order_status IN ('completed','archived')
|
|
|
AND t.restart_time IS NOT NULL
|
|
|
<if test="deptName != null and deptName != ''"> and d.dept_name like concat('%', #{deptName}, '%')</if>
|
|
|
<if test="pcsStationName != null and pcsStationName != ''"> and t.pcs_station_name like concat('%', #{pcsStationName}, '%')</if>
|