|
|
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
LEFT JOIN gxt_repair_order o ON p.order_id = o.id
|
|
|
LEFT JOIN sys_dept d ON o.pcs_station_pid = d.dept_id
|
|
|
WHERE
|
|
|
- o.real_end_time >= DATE_FORMAT( CURDATE(), '%Y-%m-01 00:00:00' )
|
|
|
+ o.occur_time >= DATE_FORMAT( CURDATE(), '%Y-%m-01 00:00:00' )
|
|
|
AND o.real_end_time < DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01 00:00:00' )
|
|
|
AND p.score IS NOT NULL AND o.scoring_status IN ('to_archive','archived')
|
|
|
UNION ALL
|
|
|
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
LEFT JOIN gxt_work_order o ON p.order_id = o.id
|
|
|
LEFT JOIN sys_dept d ON o.pcs_station_pid = d.dept_id
|
|
|
WHERE
|
|
|
- o.real_end_time >= DATE_FORMAT( CURDATE(), '%Y-%m-01 00:00:00' )
|
|
|
+ o.create_time >= DATE_FORMAT( CURDATE(), '%Y-%m-01 00:00:00' )
|
|
|
AND o.real_end_time <![CDATA[<]]> DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01 00:00:00' )
|
|
|
AND p.score IS NOT NULL AND o.scoring_status IN ('to_archive','archived')
|
|
|
) po
|