报表修改

sms_water/src/main/resources/mapper/MonitorDataReportMapper.xml

@@ -310,7 +310,7 @@
         left join sms_device_attribute  da ON da.id = p.ATTRIBUTE_ID
         LEFT JOIN sms_device d ON d.id = r.DEVICE_ID
         WHERE p.`STATUS`= 1 and p.parm_type in (3,5)
-        AND r.YEAR = #{year}  and r.month=#{month}
+        AND r.YEAR = #{year}
         <if test="sceneIds != null and sceneIds.size()>0">
             and r.PARENT_SCENE_ID in
             <foreach collection="sceneIds" item="item" open="(" close=")" separator=",">
@@ -424,7 +424,7 @@
         left join sms_device_attribute  da ON da.id = p.ATTRIBUTE_ID
         LEFT JOIN sms_device d ON d.id = r.DEVICE_ID
         WHERE p.`STATUS`= 1 and p.parm_type in (8,11,10)
-        AND r.YEAR = #{year}  and r.month=#{month}  and r.day=#{day}
+        AND r.YEAR = #{year}  and r.month=#{month}
         <if test="sceneIds != null and sceneIds.size()>0">
             and r.PARENT_SCENE_ID in
             <foreach collection="sceneIds" item="item" open="(" close=")" separator=",">
@@ -480,7 +480,7 @@
         left join sms_device_attribute  da ON da.id = p.ATTRIBUTE_ID
         LEFT JOIN sms_device d ON d.id = r.DEVICE_ID
         WHERE p.`STATUS`= 1 and p.parm_type in (8,11,10)
-        AND r.YEAR = #{year}  and r.month=#{month}  and r.day=#{day}
+        AND r.YEAR = #{year}
         <if test="sceneIds != null and sceneIds.size()>0">
             and r.PARENT_SCENE_ID in
             <foreach collection="sceneIds" item="item" open="(" close=")" separator=",">