浏览代码

调整跑品牌层的数据排序

Signed-off-by: binren <zhangbr@elab-plus.com>
binren 4 年之前
父节点
当前提交
b7ac533bdc
共有 2 个文件被更改,包括 12 次插入2 次删除
  1. 11 1
      jianye_report.py
  2. 1 1
      start_shell.sh

+ 11 - 1
jianye_report.py

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

+ 1 - 1
start_shell.sh

@@ -2,4 +2,4 @@
 # 开发环境部署
 python3 flask_app.py >>/tmp/huxingbao.log 2>&1 &
 # 生产环境部署方式,使用gunicorn进行部署。
-# gunicorn -w 1 -b 0.0.0.0:5001 service:app
+# gunicorn -w 1 -b 0.0.0.0:5001 flask_app:app