台区停电月报

src/main/java/com/minpay/db/table/own/mapper/ReportServiceMapper.java

@@ -24,4 +24,9 @@ public interface ReportServiceMapper extends IMINMybatisEntityMapper {
 
 	List<Map<String, String>> selectReportType00TqtdGS(Map<String, Object> param);
 
+	// 分段时长条数
+	String selectReportType00FenDuan(Map<String, String> shiduanMap);
+	// 月报最长停电台区
+	List<Map<String, String>> selectReportType00ZuichangTaiqu(Map<String, Object> param);
+
 }

src/main/webapp/admin/tqtd/reportProduceTqtd.html

@@ -70,10 +70,10 @@
 	<div name = "step" style = "width: 80%; margin-left : 10%; height : 300px; display : none; text-align : center;">
 		<div style = "width: 80%; margin-left : 0px;" class = "layui-upload-drag" >
 		  <p id = "fileName" contenteditable="true">国网泰安供电公司2020年8月份配网运行分析月报</p>
-		  <table id = "reportTable" class="layui-table">
+		  <table id = "reportTable" class="layui-table" style = "display : none">
 		  </table>
-		  <p id = "content"></p>
-		  <p>报表关联的工具表为《<a id = "utilName" onclick = "goUtilDetail(this)">2020年6月底低电压月报工具表</a>》  关联的报表算法为《<a id = "algorithmName" onclick = "goAlgorithmDetail(this)">国网泰安供电公司2020年8月份配网运行分析月报</a>》    的算法</p>
+		  <p id = "gongjubiao">报表关联的工具表为《<a id = "utilName" onclick = "goUtilDetail(this)">2020年6月底低电压月报工具表</a>》  关联的报表算法为《<a id = "algorithmName" onclick = "goAlgorithmDetail(this)">国网泰安供电公司2020年8月份配网运行分析月报</a>》    的算法</p>
+		  <div id = "reportDiv" style = "display : none;text-align : left;"></div>
 		</div>
 		<div style="margin-top : 50px;">
 	      <button type="button" class="layui-btn" style = "width : 214px" onclick = "goStep(4)">下一步</button>
@@ -251,7 +251,7 @@
 						range : range,
 						timeRange : timeRange,
 						monthNum : monthNum,
-						countNum : countNum
+						countNum : countNum,
 					},
 					success : function(data) {
 						if (data.code == 0) {
@@ -346,9 +346,37 @@
 				},
 				success : function(data) {
 					if (data.code == 0) {
-						excelList = data.data.resList;
-						initExcelData(excelList, "reportTable", false);
-						goStep(3);
+						// 日报和周报
+						if (timeType == '00' || timeType == '01') {
+							excelList = data.data.resList;
+							$("#reportDiv").hide();
+							$("#reportTable").show();
+							$("#gongjubiao").show();
+							initExcelData(excelList, "reportTable", false);
+							goStep(3);
+						// 月报
+						} else {
+							$("#reportTable").hide();
+							$("#gongjubiao").hide();
+							$("#reportDiv").show();
+							excelList = data.data.dataMap;
+							var dataMap = data.data.dataMap;
+							var descStr = data.data.descStr;
+							console.log(dataMap);
+							console.log(descStr);
+							for(var key in dataMap){
+								var replaceStr = "${" + key + "}";
+								if (key == "totalCountTwice") {
+									descStr = descStr.replace(/\${totalCountTwice}/g, dataMap[key]);
+								} else {
+									descStr = descStr.replace(replaceStr, dataMap[key]);
+								}
+								
+							}
+							$("#reportDiv").html(descStr);
+							goStep(3);
+						}
+						
 			    	} else {
 			    		$.ErrorAlert(res.MINErrorMessage);
 			    	}

src/main/webapp/js/min.js

@@ -1163,4 +1163,4 @@ function chineseUrlEncode(str) {
 }
 function chineseUrlDecodeURI(str) {
 	return decodeURI(decodeURI(str))
-}
+}