完成新需求

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

jianye_report.py

@@ -253,8 +253,7 @@ class JianYeReport(object):
                         number = x[2]
                 house_data.append(number)
             data_3.append(house_data)
-        data_4 = []
-        dispatchabl_data = self.get_dispatchable_mobile_qutty_house(time_range, house_ids)
+        data_4 = self.get_dispatchable_mobile_qutty_house(time_range, house_ids)
         result = []
         brand_data = []
         for id in house_ids:
@@ -281,12 +280,20 @@ class JianYeReport(object):
             for x in data_3:
                 if str(id) == str(x[0]):
                     sub.extend(x[1:])
+
+            a, b = 0, 0
+            for x in data_4:
+                if str(id) == x[0]:
+                    a, b = x[2], x[3]
+            sub.extend(a)
+            sub.extend(b)
+
             if id == '0':
                 brand_data = sub
             else:
                 result.append(sub)
         result.sort(key=lambda obj: obj[6], reverse=True)
-        if len(brand_data) == 15:
+        if len(brand_data) == 17:
             all_dat = [brand_data]
             all_dat.extend(result)
             return all_dat