kangwei: 节能环保，同比、环比时间处理

@@ -302,9 +302,9 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 		//当月数据
 		//当月数据
 		List<JnhbReportData> jnhbReportDataList = jnhbReportShowDepaetMonthDate(departIds,dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
 		List<JnhbReportData> jnhbReportDataList = jnhbReportShowDepaetMonthDate(departIds,dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
 		// 上月数据  环比
 		// 上月数据  环比
-		List<JnhbReportData> lastMonthMapDataList = jnhbReportShowDepaetMonthDate(departIds,dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
+		List<JnhbReportData> lastMonthMapDataList = jnhbReportShowDepaetMonthDate(departIds,  dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
 		// 去年数据 同比
 		// 去年数据 同比
-		List<JnhbReportData> lastYearReportDataList = jnhbReportShowDepaetMonthDate(departIds,dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
+		List<JnhbReportData> lastYearReportDataList = jnhbReportShowDepaetMonthDate(departIds,dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
 		//System.out.println("333333---**************执行时间："+ (System.nanoTime() - startTime) / 1_000_000.0 + " milliseconds");
 		//System.out.println("333333---**************执行时间："+ (System.nanoTime() - startTime) / 1_000_000.0 + " milliseconds");
 		LoadRateVO loadRateVO = null;
 		LoadRateVO loadRateVO = null;
 		PowerConsumeVO powerConsumeVO = null;
 		PowerConsumeVO powerConsumeVO = null;
@@ -325,8 +325,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 					}
 					}
 				}
 				}
 			}
 			}
-			if(lastMonthMapDataList != null && !lastMonthMapDataList.isEmpty()){
-				for(JnhbReportData reportData3 : lastMonthMapDataList){//  去年 同比
+			if(lastYearReportDataList != null && !lastYearReportDataList.isEmpty()){
+				for(JnhbReportData reportData3 : lastYearReportDataList){//  去年 同比
 					if (reportData3.getDepartId().equals(reportData.getDepartId())) {
 					if (reportData3.getDepartId().equals(reportData.getDepartId())) {
 						lastYearReportDataTemp = reportData3 ;break;
 						lastYearReportDataTemp = reportData3 ;break;
 					}
 					}