|
|
@@ -567,9 +567,9 @@ class ReportPush(object):
|
|
|
number_8 = 0
|
|
|
for x in brand_top_data_part:
|
|
|
number_5 = self.add(number_5, x[3])
|
|
|
- number_6 = self.add(number_5, x[4])
|
|
|
- number_7 = self.add(number_5, x[5])
|
|
|
- number_8 = self.add(number_5, x[6])
|
|
|
+ number_6 = self.add(number_6, x[4])
|
|
|
+ number_7 = self.add(number_7, x[5])
|
|
|
+ number_8 = self.add(number_8, x[6])
|
|
|
|
|
|
result.append(number_5)
|
|
|
result.append(number_6)
|
|
|
@@ -582,9 +582,9 @@ class ReportPush(object):
|
|
|
number_12 = 0
|
|
|
for x in xcx_top_data_part:
|
|
|
number_9 = self.add(number_9, x[2])
|
|
|
- number_10 = self.add(number_9, x[3])
|
|
|
- number_11 = self.add(number_9, x[4])
|
|
|
- number_12 = self.add(number_9, x[5])
|
|
|
+ number_10 = self.add(number_10, x[3])
|
|
|
+ number_11 = self.add(number_11, x[4])
|
|
|
+ number_12 = self.add(number_12, x[5])
|
|
|
result.append(number_9)
|
|
|
result.append(number_10)
|
|
|
result.append(number_11)
|
|
|
@@ -610,25 +610,21 @@ class ReportPush(object):
|
|
|
for house_id in house_ids:
|
|
|
a = []
|
|
|
for index, x in enumerate(xcx_top_data):
|
|
|
- if house_id == x[0]:
|
|
|
+ if str(house_id) == str(x[0]):
|
|
|
a.extend(x)
|
|
|
b = []
|
|
|
for index, y in enumerate(brand_top_data):
|
|
|
- if brands:
|
|
|
- if house_id == y[1]:
|
|
|
- b.extend(y)
|
|
|
- else:
|
|
|
- if house_id == y[1]:
|
|
|
- b.extend(y)
|
|
|
+ if str(house_id) == str(y[1]):
|
|
|
+ b.extend(y)
|
|
|
|
|
|
- if len(a) == 1 and len(b) == 1:
|
|
|
+ if len(a) > 0 and len(b) > 0:
|
|
|
result.append([b[0], a[0], a[1], self.add(a[2], b[3]), self.add(a[3], b[4]), self.add(a[4], b[5]), self.add(a[5], b[6])])
|
|
|
- elif len(a) == 1 and len(b) == 0:
|
|
|
+ elif len(a) > 0 and len(b) == 0:
|
|
|
_a = [1]
|
|
|
for x in a:
|
|
|
_a.append(x)
|
|
|
result.append(_a)
|
|
|
- elif len(a) == 0 and len(b) == 1:
|
|
|
+ elif len(a) == 0 and len(b) > 0:
|
|
|
result.append(b)
|
|
|
else:
|
|
|
pass
|
