|
@@ -57,6 +57,7 @@
|
|
|
FROM rq_iot_device_run_log a
|
|
|
WHERE a.create_time BETWEEN #{createTime[0],typeHandler=org.apache.ibatis.type.LocalDateTimeTypeHandler} AND #{createTime[1],typeHandler=org.apache.ibatis.type.LocalDateTimeTypeHandler}
|
|
|
and a.point_name = #{pointName}
|
|
|
+ and (a.device_code is null or a.device_code='')
|
|
|
<if test="deptIds != null and deptIds.size > 0">
|
|
|
AND a.dept_id IN
|
|
|
<foreach collection="deptIds" index="index" item="key" open="(" separator="," close=")">
|
|
@@ -75,6 +76,7 @@
|
|
|
WHERE
|
|
|
a.create_time >= DATE_SUB(NOW(), INTERVAL 1 YEAR)
|
|
|
AND a.fill_content IS NOT NULL
|
|
|
+ and (a.device_code is null or a.device_code ='')
|
|
|
and a.point_name = #{pointName}
|
|
|
<if test="deptIds != null and deptIds.size > 0">
|
|
|
AND a.dept_id IN
|