调整excel格式和排序逻辑

Signed-off-by: Binren Zhnag <zhangbr@elab-plus.com>

jianye_report.py

@@ -203,7 +203,7 @@ class JianYeReport(object):
                 if str(id) == str(x[0]):
                     sub.extend(x[1:])
             result.append(sub)
-        result.sort(key=lambda obj: obj[2], reverse=True)
+        result.sort(key=lambda obj: obj[5], reverse=True)
         return result
 
     def house_data(self, house_ids):

report_file_utils.py

@@ -131,8 +131,8 @@ class ReportFileUtils:
             # 区域
             start_row = 0
             # 写入标题
-            self.horizontal_cell_merge(ws, start_row, start_row, 0, len(header) - 1, sheet_name)
-            start_row += 1
+            # self.horizontal_cell_merge(ws, start_row, start_row, 0, len(header) - 1, sheet_name)
+            # start_row += 1
 
             # 写入表头
             self.insert_cells(ws, [headers[index]], start_row, 0, len(header))
@@ -166,7 +166,7 @@ class ReportFileUtils:
             #      start_row += city_info.get(key)
 
             # 写入数据
-            start_row = 2
+            start_row = 1
             self.insert_cells(ws, d, start_row, 0, len(d[0]))
         self.wb.save(file_path)