|
@@ -118,7 +118,7 @@ ORDER BY
|
|
|
INCONTROL.ZHCX_PMQ_MANAGEMENT_DISTRIBUTION x
|
|
|
LEFT JOIN INCONTROL.ZHCX_PMQ_MANAGEMENT_RECORED r ON r.ID = x.PID AND r.DELETED = '0'
|
|
|
WHERE
|
|
|
- x.DELETED = '0' AND TRUNC(r.DISTRIBUTETIME) = TO_DATE(#{data}, 'YYYY-MM-DD')
|
|
|
+ x.DELETED = '0' AND TRUNC(r.DISTRIBUTETIME) = TO_DATE(#{data}, 'YYYY-MM-DD') AND (x.STATUS IS NOT NULL OR x.STATUS !='未关闭')
|
|
|
GROUP BY x.MACHINEID,x.SERIALNUMBER,r.DEPTID
|
|
|
</select>
|
|
|
</mapper>
|