Commit 04f6c9b1 by 黄静

hj

parent 20816fa1
# Default ignored files
/shelf/
/workspace.xml
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/quality-doctor.iml" filepath="$PROJECT_DIR$/.idea/quality-doctor.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="Flask">
<option name="enabled" value="true" />
</component>
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TemplatesService">
<option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
</component>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
...@@ -23,24 +23,19 @@ class qualificationsDao: ...@@ -23,24 +23,19 @@ class qualificationsDao:
return self.dataBase.sqlResult( return self.dataBase.sqlResult(
'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, 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 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'" % (
store_type_code, industry_one_code, industry_two_code)) platform_code,store_type_code, industry_one_code, industry_two_code))
else: else:
print("SELECT * FROM `ent_qualification` WHERE export_label = '%s' AND store_type_code = '%s' and industry_one_code = '%s' and industry_two_code = '%s'" % (
export_label, store_type_code, industry_one_code, industry_two_code))
return self.dataBase.sqlResult( return self.dataBase.sqlResult(
"SELECT * FROM `ent_qualification` WHERE export_label = '%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 export_label = '%s' AND store_type_code = '%s' and industry_one_code = '%s' and industry_two_code = '%s'" % (
export_label, store_type_code, industry_one_code, industry_two_code)) platform_code,export_label, store_type_code, industry_one_code, industry_two_code))
def selectQualificationsUse(self, export_label, store_type_code, industry_one_code, industry_two_code): def selectQualificationsUse(self, platform_code,export_label, store_type_code, industry_one_code, industry_two_code):
print(
"SELECT * FROM `ent_qualification` WHERE enter_label = '%s' AND store_type_code = '%s' and industry_one_code = '%s' and industry_two_code = '%s' and industry_label = 1" % (
export_label, store_type_code, industry_one_code, industry_two_code))
return self.dataBase.sqlResult( return self.dataBase.sqlResult(
"SELECT * FROM `ent_qualification` WHERE export_label = '%s' AND store_type_code = '%s' and industry_one_code = '%s' and industry_two_code = '%s' and industry_label = 1" % ( "SELECT * FROM `ent_qualification` WHERE export_label = '%s' AND store_type_code = '%s' and industry_one_code = '%s' and platform_code = '%s' and industry_two_code = '%s' and industry_label = 1" % (
export_label, store_type_code, industry_one_code, industry_two_code)) export_label, store_type_code, industry_one_code,platform_code, industry_two_code))
...@@ -50,7 +50,7 @@ def industryOneRoute(server): ...@@ -50,7 +50,7 @@ def industryOneRoute(server):
result_dict['msg'] = "success" result_dict['msg'] = "success"
except Exception as error: except Exception as error:
print("获取一级行业大类失败:",error) print("获取一级行业大类失败:",error)
result_dict['data'] = error result_dict['data'] = str(error)
result_dict['status'] = -1 result_dict['status'] = -1
result_dict['msg'] = "failed" result_dict['msg'] = "failed"
return result_dict return result_dict
...@@ -60,17 +60,17 @@ def industryTwoRoute(server): ...@@ -60,17 +60,17 @@ def industryTwoRoute(server):
def industryTwoMain(): def industryTwoMain():
if request.method == 'POST': if request.method == 'POST':
result_dict = {} result_dict = {}
request_data = request.json
print('request_data',request_data)
industry_one_code = request_data['industryId']
try: try:
request_data = request.json
print('request_data',request_data)
industry_one_code = request_data['industryId']
industry_two_list = industryTwo(industry_one_code) industry_two_list = industryTwo(industry_one_code)
result_dict['data'] = industry_two_list result_dict['data'] = industry_two_list
result_dict['status'] = 0 result_dict['status'] = 0
result_dict['msg'] = "success" result_dict['msg'] = "success"
except Exception as error: except Exception as error:
print("获取二级行业大类失败:",error) print("获取二级行业大类失败:",error)
result_dict['data'] = error result_dict['data'] = str(error)
result_dict['status'] = -1 result_dict['status'] = -1
result_dict['msg'] = "failed" result_dict['msg'] = "failed"
return result_dict return result_dict
...@@ -12,9 +12,10 @@ def recommend_function(select_data): ...@@ -12,9 +12,10 @@ def recommend_function(select_data):
storeTypeId = select_data['storeTypeId'] storeTypeId = select_data['storeTypeId']
industryId = select_data['industryId'] industryId = select_data['industryId']
secondIndustry = select_data['secondIndustry'][0]['id'] secondIndustry = select_data['secondIndustry'][0]['id']
platform_code = select_data['platformCode']
#办理资质必须的业务员 #办理资质必须的业务员
qualifications = qualificationsdao.selectQualificationsUse(isImports,storeTypeId,industryId,secondIndustry) qualifications = qualificationsdao.selectQualificationsUse(platform_code,isImports,storeTypeId,industryId,secondIndustry)
must_use = [] must_use = []
for item in qualifications: for item in qualifications:
must_use.append(item['qualification_comments']) must_use.append(item['qualification_comments'])
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
# softWare:pycharm # softWare:pycharm
# fileName:select_qualification.py # fileName:select_qualification.py
# createTime:2020/7/19 22:05 # createTime:2020/7/19 22:05
from dao.ent_qualification import qualificationsDao from qualifications_diagnosis.dao.ent_qualification import qualificationsDao
from flask import request from flask import request
qualifications_info = qualificationsDao() qualifications_info = qualificationsDao()
#根据信息查询资质信息 #根据信息查询资质信息
def qualificationsInfo(export_label, store_type_code, industry_one_code,industry_two_code): def qualificationsInfo(platform_code,export_label, store_type_code, industry_one_code,industry_two_code):
data_dict = {} data_dict = {}
base_list = [] base_list = []
brand_list = [] brand_list = []
...@@ -20,7 +20,7 @@ def qualificationsInfo(export_label, store_type_code, industry_one_code,industry ...@@ -20,7 +20,7 @@ def qualificationsInfo(export_label, store_type_code, industry_one_code,industry
brand_alone = [] brand_alone = []
industry_alone = [] industry_alone = []
qualifications_result = qualifications_info.selectQualifications(export_label, store_type_code, industry_one_code,industry_two_code) qualifications_result = qualifications_info.selectQualifications(platform_code,export_label, store_type_code, industry_one_code,industry_two_code)
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:
...@@ -67,26 +67,27 @@ def qualificationsInfo(export_label, store_type_code, industry_one_code,industry ...@@ -67,26 +67,27 @@ def qualificationsInfo(export_label, store_type_code, industry_one_code,industry
def qualificationsRoute(server): def qualificationsRoute(server):
@server.route('/gsb/api/qualifications',methods = ['POST']) @server.route('/gsb/api/qualifications',methods = ['POST'])
def qualificationsMain(): def qualificationsMain():
result_dict ={}
if request.method == 'POST': if request.method == 'POST':
request_data = request.json result_dict = {}
isImports = request_data['isImports']
if isImports == False:
export_label = '0'
else:
export_label = '1'
store_type_code = request_data['storeTypeId']
industry_one_code = request_data['industryId']
secondIndustry = request_data['secondIndustry']
industry_two_code = secondIndustry[0]['id']
try: try:
data_dict = qualificationsInfo(export_label, store_type_code, industry_one_code,industry_two_code) request_data = request.json
isImports = request_data['isImports']
if isImports == False:
export_label = '0'
else:
export_label = '1'
platform_code = request_data['platformCode']
store_type_code = request_data['storeTypeId']
industry_one_code = request_data['industryId']
secondIndustry = request_data['secondIndustry']
industry_two_code = secondIndustry[0]['id']
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
result_dict['msg'] = "success" result_dict['msg'] = "success"
except Exception as error: except Exception as error:
print("获取一级行业大类失败:",error) # print("获取一级行业大类失败:",error,type(error))
result_dict['data'] = error result_dict['data'] = str(error)
result_dict['status'] = -1 result_dict['status'] = -1
result_dict['msg'] = "failed" result_dict['msg'] = "failed"
return result_dict return result_dict
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