修改

src/main/java/com/minpay/common/service/impl/ReportServiceImpl.java

@@ -492,10 +492,11 @@ public class ReportServiceImpl implements IReportService {
 		
 		// 恢复供电时间
 		DwFileDetail00Example example = new DwFileDetail00Example();
-		example.createCriteria().andStartTimeGreaterThanOrEqualTo(beginTime).andEndTimeLessThanOrEqualTo(endTime);
+		example.createCriteria().andEndTimeGreaterThanOrEqualTo(beginTime).andEndTimeLessThanOrEqualTo(endTime);
 		List<DwFileDetail00> selectByExample = db.selectByExample(DwFileDetail00Mapper.class, example, new MINRowBounds(1, 1));
 		String huifu = "";
 		if (selectByExample.size() != 0) {
+			System.out.println(selectByExample.get(0).getEndTime());
 			String hour = selectByExample.get(0).getEndTime().substring(8, 10);
 			String min = selectByExample.get(0).getEndTime().substring(10, 12);
 			if ("00".equals(min)) {
@@ -684,7 +685,9 @@ public class ReportServiceImpl implements IReportService {
 			}
 		}
 		// 去除最后一个符号
-		mostAddressNumDesc = mostAddressNumDesc.substring(0, mostAddressNumDesc.length() - 1);
+		if (!CommonUtil.isEmpty(mostAddressNumDesc)) {
+			mostAddressNumDesc = mostAddressNumDesc.substring(0, mostAddressNumDesc.length() - 1);
+		}
 		heji.add(totalChongfu);
 		// 没有数据的区域数值为0
 		for (List<String> list : resList) {
@@ -3399,6 +3402,7 @@ public class ReportServiceImpl implements IReportService {
 		resMap.put("desc1", desc1);
 		resMap.put("tableArray1", tableArray1);
 		resMap.put("tubiaoData1", tubiaoData1);
+		resMap.put("areaList", areaList);
 		resMap.put("desc2", desc2);
 		resMap.put("desc3", desc3);
 		resMap.put("desc4", desc4);

src/main/webapp/admin/ddy/reportProduceYb.html

@@ -249,6 +249,7 @@
 						var desc1 = resData.desc1;
 						var tableArray1 = resData.tableArray1;
 						var tubiaoData1 = resData.tubiaoData1;
+						var areaList = resData.areaList;
 						var desc2 = resData.desc2;
 						var tableArray2 = resData.tableArray2;
 						var desc3 = resData.desc3;
@@ -374,7 +375,7 @@
 							    xAxis: [
 							        {
 							            type: 'category',
-							            data: ['岱岳', '东平', '高新', '新泰', '宁阳', '肥城', '泰山', '景区'],
+							            data: areaList,
 							            axisPointer: {
 							                type: 'shadow'
 							            }