图表报表修改

sms_water/src/main/java/com/huaxu/service/impl/MonitorDataReportServiceImpl.java

@@ -38,7 +38,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
     @Override
     public List<MonitorDataChartReportDeviceDto> MonitorDataChartReportByMonth(Long sceneId,Integer year,Integer month ) {
         LoginUser loginUser = UserUtil.getCurrentUser();
-        List<MonitorDataChartReportDeviceDto> monitorDataChartReportDeviceDtos = monitorDataReportMapper.MonitorDataChartReport(2,year,month,null,sceneId,"sms_day_report",
+        List<MonitorDataChartReportDeviceDto> monitorDataChartReportDeviceDtos = monitorDataReportMapper.MonitorDataChartReport(2,year,month,null,sceneId,"sms_month_report",
                 loginUser.getTenantId(),loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
         FillLoseData(monitorDataChartReportDeviceDtos,2,year,month,1);
         return monitorDataChartReportDeviceDtos;
@@ -47,7 +47,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
     @Override
     public List<MonitorDataChartReportDeviceDto> MonitorDataChartReportByYear(Long sceneId,Integer year) {
         LoginUser loginUser = UserUtil.getCurrentUser();
-        List<MonitorDataChartReportDeviceDto> monitorDataChartReportDeviceDtos = monitorDataReportMapper.MonitorDataChartReport(1,year,null,null,sceneId,"sms_day_report",
+        List<MonitorDataChartReportDeviceDto> monitorDataChartReportDeviceDtos = monitorDataReportMapper.MonitorDataChartReport(1,year,null,null,sceneId,"sms_year_report",
                 loginUser.getTenantId(),loginUser.getType(),loginUser.getPermissonType(),loginUser.getProgramItemList());
         FillLoseData(monitorDataChartReportDeviceDtos,1,year,1,1);
         return monitorDataChartReportDeviceDtos;