|
|
@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
WHERE
|
|
|
o.real_end_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
|
|
|
UNION ALL
|
|
|
SELECT
|
|
|
o.work_order_project_no AS order_code,
|
|
|
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
WHERE
|
|
|
o.real_end_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
|
|
|
) po
|
|
|
WHERE 1=1
|
|
|
<if test="userId != null">
|