逻辑修改

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

jianye_report.py

@@ -132,7 +132,7 @@ class JianYeReport(object):
             for x in self.db.select(Sql.sql_10, [time_range[0], time_range[1]]):
                 if x[0] == type_value:
                    number = x[1]
-            data_3.append(number_2)
+            data_3.append(number)
         result.extend(data_1)
         result.extend(data_2)
         result.extend(data_3)
@@ -248,9 +248,13 @@ class JianYeReport(object):
                 message[11] = '邮件信息生成成功'
                 if customer_type == 2:
                     # 集团
+                    message['99'] = '集团'
                     table_1 = self.brand_data()
+                    message[33] = 'brand_data'
                     house_ids = self.get_house_id_by_brand_id(ids)
+                    message[55] = 'get_house_id_by_brand_id'
                     table_2 = self.house_data(house_ids)
+                    message[66] = 'house_data'
                     # data, sheet_names, title, headers, save_path
                     content = content.format(table_1[0], table_1[1], table_1[2], table_1[3], table_1[4], table_1[5],
                     table_1[6], table_1[7], table_1[8], table_1[9], table_1[10], table_1[11], table_1[12],table_1[13], table_1[14],
@@ -262,11 +266,15 @@ class JianYeReport(object):
                     rfu.create_excel_file(table_2, self.sheet_names_1, title, [self.head_1, self.head_1, self.head_1], save_path)
                 elif customer_type == 1:
                     # 项目
+                    message[111] = '项目'
                     table_2 = self.house_data(self.get_house_ids(ids))
+                    message[222] = 'house_data'
                     rfu.create_excel_file(table_2, self.sheet_names_1, title, [self.head_1, self.head_1, self.head_1], save_path)
                 elif customer_type == 3:
                     # 区域
+                    message[333] = '区域'
                     table_2 = self.house_data(self.get_house_ids(ids))
+                    message[444] = 'self.house_data'
                     rfu.create_excel_file(table_2, self.sheet_names_1, title, [self.head_1, self.head_1, self.head_1], save_path)
                 else:
                     pass

report_public_funs_utils.py

@@ -12,7 +12,7 @@ class ReportPublicFunsUtils:
         now_time = datetime.datetime.now()
         first_day_of_month = datetime.datetime.now().strftime('%Y-%M')
         if not type:
-           return [first_day_of_month + '-01 00:00:00', now_time.strftime('%Y-%m-%d %M:%I:%S')]
+            return [first_day_of_month + '-01 00:00:00', now_time.strftime('%Y-%m-%d %M:%I:%S')]
         else:
             return [first_day_of_month + '-01', now_time.strftime('%Y-%m-%d')]