|
@@ -5,6 +5,7 @@ from mail_content_text import MailContentText
|
|
from email_util import EmailUtil
|
|
from email_util import EmailUtil
|
|
from file_util import FileUtil
|
|
from file_util import FileUtil
|
|
from report_file_utils import ReportFileUtils
|
|
from report_file_utils import ReportFileUtils
|
|
|
|
+from collections import deque
|
|
|
|
|
|
|
|
|
|
class JianYeReport(object):
|
|
class JianYeReport(object):
|
|
@@ -237,6 +238,7 @@ class JianYeReport(object):
|
|
house_data.append(number)
|
|
house_data.append(number)
|
|
data_3.append(house_data)
|
|
data_3.append(house_data)
|
|
result = []
|
|
result = []
|
|
|
|
+ brand_data = []
|
|
for id in house_ids:
|
|
for id in house_ids:
|
|
sub = []
|
|
sub = []
|
|
if id == '0':
|
|
if id == '0':
|
|
@@ -261,8 +263,16 @@ class JianYeReport(object):
|
|
for x in data_3:
|
|
for x in data_3:
|
|
if str(id) == str(x[0]):
|
|
if str(id) == str(x[0]):
|
|
sub.extend(x[1:])
|
|
sub.extend(x[1:])
|
|
- result.append(sub)
|
|
|
|
|
|
+ if id == '0':
|
|
|
|
+ brand_data = sub
|
|
|
|
+ else:
|
|
|
|
+ result.append(sub)
|
|
result.sort(key=lambda obj: obj[6], reverse=True)
|
|
result.sort(key=lambda obj: obj[6], reverse=True)
|
|
|
|
+ if len(brand_data) == 15:
|
|
|
|
+ all_dat = []
|
|
|
|
+ all_dat.extend(brand_data)
|
|
|
|
+ all_dat.extend(result)
|
|
|
|
+ return all_dat
|
|
return result
|
|
return result
|
|
|
|
|
|
def house_data(self, house_ids):
|
|
def house_data(self, house_ids):
|