|
@@ -307,9 +307,9 @@ class JianYeReport(object):
|
|
|
region_name = customer[4]
|
|
|
title = self.get_mail_title(customer_type, region_name, name)
|
|
|
content = self.get_mail_content(customer_type)
|
|
|
- file_path = save_path + '/' + title + '.xls'
|
|
|
try:
|
|
|
if customer_type == 2:
|
|
|
+ file_path = save_path + '/' + title + '.xls'
|
|
|
content = self.get_brand_content(content, brand_table_one)
|
|
|
send_data.append(
|
|
|
[brand_table_two, self.sheet_names_1, title, [self.head_1, self.head_1, self.head_1],
|
|
@@ -318,11 +318,13 @@ class JianYeReport(object):
|
|
|
title_1, title_2 = title[0], title[1]
|
|
|
table_2 = self.house_data(self.get_house_ids(ids))
|
|
|
table_3 = self.get_table_3(self.get_house_ids(ids))
|
|
|
+ file_path = save_path + '/' + title_1 + '.xls'
|
|
|
file_path_1 = save_path + '/' + title_2 + '.xls'
|
|
|
send_data.append(
|
|
|
[table_2, self.sheet_names_1, title_1, [self.head_1, self.head_1, self.head_1], file_path,
|
|
|
content, name, mail, title_2, [self.head_2, self.head_2, self.head_2], table_3, file_path_1])
|
|
|
elif customer_type == 3:
|
|
|
+ file_path = save_path + '/' + title + '.xls'
|
|
|
table_2 = self.house_data(self.get_house_ids(ids))
|
|
|
send_data.append(
|
|
|
[table_2, self.sheet_names_1, title, [self.head_1, self.head_1, self.head_1], file_path,
|
|
@@ -405,20 +407,21 @@ class JianYeReport(object):
|
|
|
region_name = customer[4]
|
|
|
title = self.get_mail_title(customer_type, region_name, name)
|
|
|
content = self.get_mail_content(customer_type)
|
|
|
- file_path = save_path + '/' + title + '.xls'
|
|
|
if customer_type == 1:
|
|
|
# 项目
|
|
|
# 项目
|
|
|
title_1, title_2 = title[0], title[1]
|
|
|
table_2 = self.house_data(ids)
|
|
|
table_3 = self.get_table_3(ids)
|
|
|
- file_path_1 = save_path + '/' + title_1 + '.xls'
|
|
|
+ file_path = save_path + '/' + title_1 + '.xls'
|
|
|
+ file_path_1 = save_path + '/' + title_2 + '.xls'
|
|
|
send_data.append(
|
|
|
[table_2, self.sheet_names_1, title_1, [self.head_1, self.head_1, self.head_1], file_path,
|
|
|
content, name, mail, title_2, [self.head_2, self.head_2, self.head_2], table_3,
|
|
|
file_path_1])
|
|
|
elif customer_type == 2:
|
|
|
# 集团
|
|
|
+ file_path = save_path + '/' + title + '.xls'
|
|
|
brand_table_one = self.brand_data()
|
|
|
house_ids = self.get_house_id_by_brand_id('13')
|
|
|
brand_table_two = self.house_data(house_ids)
|
|
@@ -428,6 +431,7 @@ class JianYeReport(object):
|
|
|
file_path, content, name, mail])
|
|
|
elif customer_type == 3:
|
|
|
# 区域
|
|
|
+ file_path = save_path + '/' + title + '.xls'
|
|
|
table_2 = self.house_data(ids)
|
|
|
send_data.append(
|
|
|
[table_2, self.sheet_names_1, title, [self.head_1, self.head_1, self.head_1], file_path,
|