report_push: 增加排序

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

report_push.py

@@ -443,7 +443,6 @@ class ReportPush(object):
         customers = self.db.select(self.sql_4, [task_key])
         # a.task_key, a.customer_id, b.customer_type, b.`name`, b.mail, GROUP_CONCAT(c.house_or_brand_id)
         time_range = self.get_time_range(task_key)
-        result['time'] = time_range
         all_time_rang = self.get_time_range(4)
         # 有限时间范围内的数据
         xcx_top_data = self.xcx_top(time_range)
@@ -484,7 +483,6 @@ class ReportPush(object):
             result_data_3 = []
             result_data_4 = []
             result_data_5 = []
-            result_data_6 = []
             result_data_7 = []
             result_data_8 = []
 
@@ -562,10 +560,15 @@ class ReportPush(object):
             result_data_6 = self.house_with_brand_for_share(result_data_7, result_data_8)
 
             customer_data[1] = result_data_1
+            result_data_2.sort(key=lambda obj: obj[0])
             customer_data[2] = result_data_2
+            result_data_3.sort(key=lambda obj: obj[0])
             customer_data[3] = result_data_3
+            result_data_4.sort(key=lambda obj: obj[0])
             customer_data[4] = result_data_4
+            result_data_5.sort(key=lambda obj: obj[0])
             customer_data[5] = result_data_5
+            self.sort(result_data_6, 1)
             customer_data[6] = result_data_6
             result_data_7_format = []
             for x in result_data_7:
@@ -576,6 +579,7 @@ class ReportPush(object):
                 ele.append(total)
                 ele.extend(data)
                 result_data_7_format.append(ele)
+            self.sort(result_data_7_format, 1)
             customer_data[7] = result_data_7_format
             result_data_8_format = []
             for x in result_data_8:
@@ -587,10 +591,15 @@ class ReportPush(object):
                 ele.append(total)
                 ele.extend(data)
                 result_data_8_format.append(ele)
+            self.sort(result_data_8_format, 1)
             customer_data[8] = result_data_8_format
             result[name] = customer_data
         return result
 
+    def sort(self, data, idnex):
+        data.sort(key=lambda obj: obj[idnex])
+        data.reverse()
+
     def house_with_brand_for_share(self, house_data, brand_data):
         house_ids = []
         result = []