综合展示修改

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

@@ -1054,7 +1054,7 @@
         left join sms_scene s on s.SCENE_TYPE_ID =st.id
         left join sms_device_parm dp on s.id=dp.PARENT_SCENE_ID
         left join sms_month_report r on r.DEVICE_ID= dp.DEVICE_ID and r.ATTRIBUTE_ID = dp.ATTRIBUTE_ID and r.year = #{year} and r.month= #{month} and r.day = #{day}
-        where  dp.`STATUS`=1 and
+        where  dp.`STATUS`=1
         <if test="sceneTypeName!=null">
             and st.SCENE_TYPE_NAME = #{sceneTypeName}
         </if>