From 42efb7fcd7105e36ea9d9d64e961e0c401eb77e8 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Tue, 13 Apr 2021 12:00:29 +0800
Subject: [PATCH] updated excel exporter of meterenergy in API

---
 myems-api/excelexporters/meterenergy.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/myems-api/excelexporters/meterenergy.py b/myems-api/excelexporters/meterenergy.py
index a7310abb..560874cf 100644
--- a/myems-api/excelexporters/meterenergy.py
+++ b/myems-api/excelexporters/meterenergy.py
@@ -334,8 +334,13 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
         category = report['meter']['energy_category_name']
         ca_len = len(category)
         parameters_names_len = len(report['parameters']['names'])
-        start_detail_data_row_num = 7 + (parameters_names_len + ca_len) * 6
-
+        parameters_data = report['parameters']
+        parameters_parameters_datas_len = 0
+        for i in range(0, parameters_names_len):
+            if len(parameters_data['timestamps'][i]) == 0:
+                continue
+            parameters_parameters_datas_len += 1
+        start_detail_data_row_num = 13 + (parameters_parameters_datas_len + ca_len) * 6
         ws['B11'].font = title_font
         ws['B11'] = name + '详细数据'