hj

quality-doctor/dao/ent_qualification.py

@@ -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)
 
     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 (
-        '2716', '3041', '3042', '3043', '3044', '3045', '3258', '3476'):
+        if industry_one_code in (25, 28, 36, 37) or industry_two_code in (
+        2716, 3041, 3042, 3043, 3044, 3045, 3258, 3476):
             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'" % (
                 platform_code,store_type_code, industry_one_code, industry_two_code))

quality-doctor/service/recommend_info.py

@@ -11,7 +11,9 @@ def recommend_function(select_data):
         isImports = 0
     storeTypeId = select_data['storeTypeId']
     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']
 
     #办理资质必须的业务员

quality-doctor/service/select_qualification.py

@@ -24,10 +24,12 @@ def qualificationsInfo(platform_code,export_label, store_type_code, industry_one
     print('qualifications_result',qualifications_result)
     if qualifications_result:
         for row in qualifications_result:
+            print('rowrowrowrow',row)
             qualification_type = row['qualification_type']
             if qualification_type == '企业资质':
                 if row['qualification_comments'] not in base_alone:
                     base_alone.append(row['qualification_comments'])
+                    if row['qualification_comments']:
                         base_dict = {}
                         base_dict["id"] = row['qualification_comments_code']
                         base_dict["name"] = row['qualification_comments']
@@ -35,9 +37,12 @@ def qualificationsInfo(platform_code,export_label, store_type_code, industry_one
                         if base_dict:
                             base_list.append(base_dict)
                         data_dict['base'] = base_list
+                    else:
+                        data_dict['base'] = None
             elif qualification_type == '品牌资质':
                 if row['qualification_comments'] not in brand_alone:
                     brand_alone.append(row['qualification_comments'])
+                    if row['qualification_comments']:
                         brand_dict = {}
                         brand_dict["id"] = row['qualification_comments_code']
                         brand_dict["name"] = row['qualification_comments']
@@ -45,9 +50,12 @@ def qualificationsInfo(platform_code,export_label, store_type_code, industry_one
                         if brand_dict:
                             brand_list.append(brand_dict)
                         data_dict['brand'] = brand_list
+                    else:
+                        data_dict['brand'] = None
             elif qualification_type == '行业资质':
                 if row['qualification_comments'] not in industry_alone:
                     industry_alone.append(row['qualification_comments'])
+                    if row['qualification_comments']:
                         industry_dict = {}
                         industry_dict["id"] = row['qualification_comments_code']
                         industry_dict["name"] = row['qualification_comments']
@@ -56,12 +64,15 @@ def qualificationsInfo(platform_code,export_label, store_type_code, industry_one
                             industry_list.append(industry_dict)
                         data_dict['industry'] = industry_list
                     else:
+                        data_dict['industry'] = None
+            else:
                 print("资质列表信息错误")
                 return "资质列表信息错误"
     else:
         data_dict['base'] = ['暂停接受入驻']
         data_dict['brand'] = ['暂停接受入驻']
         data_dict['industry'] = ['暂停接受入驻']
+    print('data_dict',data_dict)
     return data_dict
 
 def qualificationsRoute(server):
@@ -69,6 +80,7 @@ def qualificationsRoute(server):
     def qualificationsMain():
         if request.method == 'POST':
             result_dict = {}
+            industry_two_code = ''
             try:
                 request_data = request.json
                 isImports = request_data['isImports']
@@ -80,7 +92,11 @@ def qualificationsRoute(server):
                 store_type_code = request_data['storeTypeId']
                 industry_one_code = request_data['industryId']
                 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)
                 result_dict['data'] = data_dict
                 result_dict['status'] = 0