优化

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

@@ -258,17 +258,22 @@ public class ReportServiceImpl implements IReportService {
     		Map<String,Object> mm = new HashMap<String,Object>();
 			mm.put("range",range);
 			mm.put("timeRange",timeRange);
-//			mm.put("reportInf",reportInf);
+			mm.put("reportTypeId",reportTypeId);
 			Map<String,Object> resList = reportTypeXlgzzRb(mm, request);
 			resMap.put("resList", resList);
 		} else if(Constant.REPORT_TYPE_18.equals(reportTypeId)){//过重载周报
-
+			Map<String,Object> mm = new HashMap<String,Object>();
+			mm.put("range",range);
+			mm.put("timeRange",timeRange);
+			mm.put("reportTypeId",reportTypeId);
+			Map<String,Object> resList = reportTypeXlgzzRb(mm, request);
+			resMap.put("resList", resList);
 		}
 		return resMap;
 	}
 
 	/**
-	 *
+	 *获取日报数据数据解析规则-重过载时长累加，平均负债率（？）
 	 * @param map
 	 * @param request
 	 * @return

src/main/java/com/minpay/reportManage/action/XlgzzReportAction.java

@@ -293,12 +293,12 @@ public class XlgzzReportAction implements IMINAction {
 //            dataList.add(dataList.get(0));
 //        }
         int index = 0;
-        index = ExportUtils.XlzgzCreateSheet(wb,index,"线路重载明细",titleArray,fieldArray,descxl.toString(),dataList,new HashMap<String,String>());
+        ExportUtils.XlzgzCreateSheet(wb,index,"线路重载明细",titleArray,fieldArray,descxl.toString(),dataList,new HashMap<String,String>());
 
         //******************************************线路过载明细******************************************//
         titleArray[3] = "过载时长(h)";
         List<Map<String,String>> dataList2 = (List<Map<String, String>>) temp.get("result2");
-        index = ExportUtils.XlzgzCreateSheet(wb,index,"线路过载明细",titleArray,fieldArray,"",dataList2,new HashMap<String,String>());
+        ExportUtils.XlzgzCreateSheet(wb,index,"线路过载明细",titleArray,fieldArray,"",dataList2,new HashMap<String,String>());
 
         //******************************************公变过载明细******************************************//
         String[] titleArray2 = new String[]{"单位","供电所","公变名称","重载时长(h)","平均负载率(%)","原因","解决措施"};
@@ -315,7 +315,7 @@ public class XlgzzReportAction implements IMINAction {
                 .append("  ")
                 .append("注：配变负载率连续2小时在80%-100%之间为重载，连续2小时在100%以上为过载。");
         List<Map<String,String>> dataList4 = (List<Map<String, String>>) temp.get("result4");
-        index = ExportUtils.XlzgzCreateSheet(wb,index,"公变重载明细",titleArray2,fieldArray2,descxl2.toString(),dataList4,new HashMap<String,String>());
+        ExportUtils.XlzgzCreateSheet(wb,index,"公变重载明细",titleArray2,fieldArray2,descxl2.toString(),dataList4,new HashMap<String,String>());
 
         //******************************************公变重载明细******************************************//
         titleArray2[3] = "过载时长(h)";
@@ -327,7 +327,7 @@ public class XlgzzReportAction implements IMINAction {
         String[] titleArray3 = new String[]{"客户总量（户）","平均到达现场时间（分）","工单处理平均时长（分）","到达现场超时数",
                 "工单时长超70分钟数","故障类型#客户内部故障","故障类型#低压故障","故障类型#非电力故障","故障类型#电能质量等故障","疑似虚假回单","工单总数","万户报修率"};
         String[] fieldArray3 = new String[]{"1","2","3","4","5","6","7","8","9","10","11","12","13","","","",""};
-        index = ExportUtils.XlzgzCreateSheet(wb,index,"抢修类工单报表明细",titleArray3,fieldArray3,"",new ArrayList<>(),new HashMap<String,String>());
+        ExportUtils.XlzgzCreateSheet(wb,index,"抢修类工单报表明细",titleArray3,fieldArray3,"",new ArrayList<>(),new HashMap<String,String>());
         return wb;
     }
 

src/main/webapp/admin/xlgzz/reportManageXlgzz.html

@@ -55,12 +55,13 @@
 				"<i class='iconfont up iconSelect_drop-down'/></i>");
 			$("#content").slideToggle();
 		});
-		var pageId = "290000";//线路重过载日报
+		var pageId = "290000";//线路重过载
 		// 报表类型
-		var reportType = getQueryString("reportType")
-
+		var reportType = getQueryString("reportType")//XLGZZRB or XLGZZZB
+		if("XLGZZZB" == reportType){
+			pageId = "290001"
+		}
 		var timeType = getQueryString("timeType");// 00日报01周报02月报
-
 		 var table;
 		 var form;
 		 layui.use(['table','laydate','form'], function(){
@@ -132,6 +133,7 @@
 		 });
 
 		  function reloadSearch (t) {
+		  	console.log("1111111111111111111111111111111111111111111111111")
 				var fileName = $("#fileName").val();
 				var date = $("#date").val();
 				//执行重载

src/main/webapp/admin/xlgzz/reportProduceXlgzz.html

@@ -75,10 +75,7 @@
 	<div name = "step" style = "width: 90%; margin-left : 5%; height : 300px;display : none; text-align : center;">
 		<div style = "width: 100%; margin-left : 0px;" class = "layui-upload-drag" >
 		  <p id = "fileName" contenteditable="true">国网泰安供电公司2020年8月份配网运行分析月报</p>
-			<!--表格-->
-<!--
-		  <table id = "reportTable" class="layui-table" style = "display : none"></table>
--->		  <div class="layui-tab" lay-filter="demo"  style="min-height: 400px;">
+		  <div class="layui-tab" lay-filter="demo"  style="min-height: 400px;">
 			<ul class="layui-tab-title">
 				<li class="layui-this" lay-id="11">线路重载明细</li>
 				<li lay-id="11x">线路过载明细</li>
@@ -148,7 +145,7 @@
     <script>
 		var pageId = getQueryString("pageId");
 		var timeType = getQueryString("timeType");// 报表周期：00日报 01周报 02月报
-		var reportType = getQueryString("reportType");// 报表类型
+		var reportType = getQueryString("reportType");// 报表类型XLGZZRB or XLGZZZB
 		// 日报
 		if (timeType == '00') {
 			$("#dayRange").show();
@@ -386,24 +383,75 @@
 				},
 				success : function(data) {
 					if (data.code == 0) {//查询结果集成功
-						// 日报
-						if (timeType == '00') {
+
+						//渲染表格
+						$table.render({
+							elem: '#demo1'
+							,limit:100
+							,cols: [[ //表头
+								{field: 'DFD10_XGSMC', title: '单位', width:120}
+								,{field: 'DFD10_BZMC', title: '供电所', width:120}
+								,{field: 'DFD10_XLMC', title: '线路名称', width:120}
+								,{field: 'sum', title: '重载时长(h)', width:120}
+								,{field: 'avg', title: '平均负载率(%)', width: 120}
+							]],
+							data:data.data.resList.result
+						});
+
+						if (timeType == '00') {// 日报
 							$("#gongjubiao").hide();
-							$("#reportTable").show();
+							// $("#reportTable").show();
+
 							// $element.tabDelete('demo', '22');
-							//渲染表格
 							$table.render({
-								elem: '#demo1'
+								elem: '#demo1x'
 								,limit:100
 								,cols: [[ //表头
 									{field: 'DFD10_XGSMC', title: '单位', width:120}
 									,{field: 'DFD10_BZMC', title: '供电所', width:120}
 									,{field: 'DFD10_XLMC', title: '线路名称', width:120}
-									,{field: 'sum', title: '重载时长(h)', width:120}
+									,{field: 'sum', title: '过载时长(h)', width:120}
+									,{field: 'avg', title: '平均负载率(%)', width: 120}
+								]],
+								data:data.data.resList.result2
+							});
+							$table.render({
+								elem: '#demo2'
+								,limit:100
+								,cols: [[ //表头
+									{field: 'DFD9_UNIT', title: '单位', width:120}
+									,{field: 'DFD9_BZMC', title: '供电所', width:120}
+									,{field: 'DFD9_GBMC', title: '公变名称', width:120}
+									,{field: 'DFD9_ZZSC', title: '重载时长(h)', width:120}
+									,{field: 'avg', title: '平均负载率(%)', width: 120}
+									,{field: 'DFD9_JTYY', title: '原因', width: 120}
+									,{field: 'DFD9_JTJJCS', title: '解决措施', width: 120}
+								]],
+								data:data.data.resList.result4
+							});
+							$table.render({
+								elem: '#demo2x'
+								,limit:100
+								,cols: [[ //表头
+									{field: 'DFD9_UNIT', title: '单位', width:120}
+									,{field: 'DFD9_BZMC', title: '供电所', width:120}
+									,{field: 'DFD9_GBMC', title: '公变名称', width:120}
+									,{field: 'DFD9_GZSC', title: '过载时长(h)', width:120}
 									,{field: 'avg', title: '平均负载率(%)', width: 120}
+									,{field: 'DFD9_JTYY', title: '原因', width: 120}
+									,{field: 'DFD9_JTJJCS', title: '解决措施', width: 120}
 								]],
-								data:data.data.resList.result
+								data:data.data.resList.result3
 							});
+							//描述
+							$("#desc1").html("&nbsp;&nbsp;&nbsp;"+data.data.resList.descStr[0]);
+							$("#desc11").html("&nbsp;&nbsp;&nbsp;"+data.data.resList.descStr[1]);
+							$("#desc2").html("&nbsp;&nbsp;&nbsp;"+data.data.resList.descStr2[0]);
+							$("#desc22").html("&nbsp;&nbsp;&nbsp;"+data.data.resList.descStr2[1]);
+							goStep(3);
+						} else if (timeType == '02' || timeType == '01') {// 月报 或 周报
+							$("#gongjubiao").hide();
+							// $("#reportTable").show();
 							$table.render({
 								elem: '#demo1x'
 								,limit:100
@@ -450,10 +498,8 @@
 							$("#desc2").html("&nbsp;&nbsp;&nbsp;"+data.data.resList.descStr2[0]);
 							$("#desc22").html("&nbsp;&nbsp;&nbsp;"+data.data.resList.descStr2[1]);
 							goStep(3);
-						// 月报 或 周报
-						} else if (timeType == '02' || timeType == '01') {
-
 						}
+						//抢修类工单报表
 						$table.render({
 							elem: '#demo3'
 							,limit:100