Commit 833aa240 by 黄静

hj

parent 04f6c9b1
...@@ -24,8 +24,8 @@ class qualificationsDao: ...@@ -24,8 +24,8 @@ class qualificationsDao:
'SELECT industry_two_code,industry_two FROM ent_qualification WHERE industry_one_code = "%s" GROUP BY industry_two ORDER BY id' % industry_one_code) 'SELECT industry_two_code,industry_two FROM ent_qualification WHERE industry_one_code = "%s" GROUP BY industry_two ORDER BY id' % industry_one_code)
def selectQualifications(self,platform_code,export_label, store_type_code, industry_one_code, industry_two_code): def selectQualifications(self,platform_code,export_label, store_type_code, industry_one_code, industry_two_code):
if industry_one_code in ('25', '28', '36', '37') or industry_two_code in ( if industry_one_code in (25, 28, 36, 37) or industry_two_code in (
'2716', '3041', '3042', '3043', '3044', '3045', '3258', '3476'): 2716, 3041, 3042, 3043, 3044, 3045, 3258, 3476):
return self.dataBase.sqlResult( return self.dataBase.sqlResult(
"SELECT * FROM `ent_qualification` WHERE platform_code = '%s' and store_type_code = '%s' and industry_one_code = '%s' and industry_two_code = '%s'" % ( "SELECT * FROM `ent_qualification` WHERE platform_code = '%s' and store_type_code = '%s' and industry_one_code = '%s' and industry_two_code = '%s'" % (
platform_code,store_type_code, industry_one_code, industry_two_code)) platform_code,store_type_code, industry_one_code, industry_two_code))
......
...@@ -11,7 +11,9 @@ def recommend_function(select_data): ...@@ -11,7 +11,9 @@ def recommend_function(select_data):
isImports = 0 isImports = 0
storeTypeId = select_data['storeTypeId'] storeTypeId = select_data['storeTypeId']
industryId = select_data['industryId'] industryId = select_data['industryId']
secondIndustry = select_data['secondIndustry'][0]['id'] for item in select_data['secondIndustry']:
if item['isChoice'] == True:
secondIndustry = item['id']
platform_code = select_data['platformCode'] platform_code = select_data['platformCode']
#办理资质必须的业务员 #办理资质必须的业务员
......
...@@ -24,37 +24,47 @@ def qualificationsInfo(platform_code,export_label, store_type_code, industry_one ...@@ -24,37 +24,47 @@ def qualificationsInfo(platform_code,export_label, store_type_code, industry_one
print('qualifications_result',qualifications_result) print('qualifications_result',qualifications_result)
if qualifications_result: if qualifications_result:
for row in qualifications_result: for row in qualifications_result:
print('rowrowrowrow',row)
qualification_type = row['qualification_type'] qualification_type = row['qualification_type']
if qualification_type == '企业资质': if qualification_type == '企业资质':
if row['qualification_comments'] not in base_alone: if row['qualification_comments'] not in base_alone:
base_alone.append(row['qualification_comments']) base_alone.append(row['qualification_comments'])
base_dict = {} if row['qualification_comments']:
base_dict["id"] = row['qualification_comments_code'] base_dict = {}
base_dict["name"] = row['qualification_comments'] base_dict["id"] = row['qualification_comments_code']
base_dict['isChoice'] = False base_dict["name"] = row['qualification_comments']
if base_dict: base_dict['isChoice'] = False
base_list.append(base_dict) if base_dict:
data_dict['base'] = base_list base_list.append(base_dict)
data_dict['base'] = base_list
else:
data_dict['base'] = None
elif qualification_type == '品牌资质': elif qualification_type == '品牌资质':
if row['qualification_comments'] not in brand_alone: if row['qualification_comments'] not in brand_alone:
brand_alone.append(row['qualification_comments']) brand_alone.append(row['qualification_comments'])
brand_dict = {} if row['qualification_comments']:
brand_dict["id"] = row['qualification_comments_code'] brand_dict = {}
brand_dict["name"] = row['qualification_comments'] brand_dict["id"] = row['qualification_comments_code']
brand_dict['isChoice'] = False brand_dict["name"] = row['qualification_comments']
if brand_dict: brand_dict['isChoice'] = False
brand_list.append(brand_dict) if brand_dict:
data_dict['brand'] = brand_list brand_list.append(brand_dict)
data_dict['brand'] = brand_list
else:
data_dict['brand'] = None
elif qualification_type == '行业资质': elif qualification_type == '行业资质':
if row['qualification_comments'] not in industry_alone: if row['qualification_comments'] not in industry_alone:
industry_alone.append(row['qualification_comments']) industry_alone.append(row['qualification_comments'])
industry_dict = {} if row['qualification_comments']:
industry_dict["id"] = row['qualification_comments_code'] industry_dict = {}
industry_dict["name"] = row['qualification_comments'] industry_dict["id"] = row['qualification_comments_code']
industry_dict['isChoice'] = False industry_dict["name"] = row['qualification_comments']
if industry_dict: industry_dict['isChoice'] = False
industry_list.append(industry_dict) if industry_dict:
data_dict['industry'] = industry_list industry_list.append(industry_dict)
data_dict['industry'] = industry_list
else:
data_dict['industry'] = None
else: else:
print("资质列表信息错误") print("资质列表信息错误")
return "资质列表信息错误" return "资质列表信息错误"
...@@ -62,6 +72,7 @@ def qualificationsInfo(platform_code,export_label, store_type_code, industry_one ...@@ -62,6 +72,7 @@ def qualificationsInfo(platform_code,export_label, store_type_code, industry_one
data_dict['base'] = ['暂停接受入驻'] data_dict['base'] = ['暂停接受入驻']
data_dict['brand'] = ['暂停接受入驻'] data_dict['brand'] = ['暂停接受入驻']
data_dict['industry'] = ['暂停接受入驻'] data_dict['industry'] = ['暂停接受入驻']
print('data_dict',data_dict)
return data_dict return data_dict
def qualificationsRoute(server): def qualificationsRoute(server):
...@@ -69,6 +80,7 @@ def qualificationsRoute(server): ...@@ -69,6 +80,7 @@ def qualificationsRoute(server):
def qualificationsMain(): def qualificationsMain():
if request.method == 'POST': if request.method == 'POST':
result_dict = {} result_dict = {}
industry_two_code = ''
try: try:
request_data = request.json request_data = request.json
isImports = request_data['isImports'] isImports = request_data['isImports']
...@@ -80,7 +92,11 @@ def qualificationsRoute(server): ...@@ -80,7 +92,11 @@ def qualificationsRoute(server):
store_type_code = request_data['storeTypeId'] store_type_code = request_data['storeTypeId']
industry_one_code = request_data['industryId'] industry_one_code = request_data['industryId']
secondIndustry = request_data['secondIndustry'] secondIndustry = request_data['secondIndustry']
industry_two_code = secondIndustry[0]['id'] for item in secondIndustry:
if item['isChoice'] == True:
industry_two_code = int(item['id'])
print('传入参数:',request_data)
print('查询条件',platform_code,export_label, store_type_code, industry_one_code,industry_two_code)
data_dict = qualificationsInfo(platform_code,export_label, store_type_code, industry_one_code,industry_two_code) data_dict = qualificationsInfo(platform_code,export_label, store_type_code, industry_one_code,industry_two_code)
result_dict['data'] = data_dict result_dict['data'] = data_dict
result_dict['status'] = 0 result_dict['status'] = 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment