fix20230407

apps/view_360company/view.py

@@ -274,7 +274,7 @@ def search():
 
 
     try:
     try:
         es = Elasticsearch([{'host': '39.100.39.50', 'port': 9200}])
         es = Elasticsearch([{'host': '39.100.39.50', 'port': 9200}])
-        data = es.search(index="jc_enterperise", body=body)
+        data = es.search(index="jc_enterperise1", body=body)
         data_list = []
         data_list = []
         # print(data_list)
         # print(data_list)
         size = data["hits"]['total']
         size = data["hits"]['total']

apps/view_choose/choose_view.py

@@ -184,7 +184,7 @@ def global_factory(key_words, district_name, factory_name, industry_name, page,
                 "industry_name": factory_obj.attract_status,
                 "industry_name": factory_obj.attract_status,
                 "is_standard": factory_obj.is_standard,
                 "is_standard": factory_obj.is_standard,
                 "attract_status": factory_obj.attract_status,
                 "attract_status": factory_obj.attract_status,
-                "price_url": factory_obj.price_url,
+                "price_url": factory_obj.price_url if factory_obj.price_url else factory_obj.inside_picture_url if factory_obj.inside_picture_url else factory_obj.outer_picture_url if factory_obj.outer_picture_url else "",
                 "lng": factory_obj.lng,
                 "lng": factory_obj.lng,
                 "lat": factory_obj.lat
                 "lat": factory_obj.lat
             } for factory_obj in factory_obj_list]
             } for factory_obj in factory_obj_list]

apps/view_map/view.py

@@ -479,13 +479,12 @@ def attract_enterprise():
             Enterprise.isfive == '1' if qualificat == '中国500强企业' else text(''),
             Enterprise.isfive == '1' if qualificat == '中国500强企业' else text(''),
             Enterprise.quoted_company == '1' if qualificat == '上市企业' else text(''),
             Enterprise.quoted_company == '1' if qualificat == '上市企业' else text(''),
             Enterprise.chain_master == '1' if qualificat == '链主企业' else text(''),
             Enterprise.chain_master == '1' if qualificat == '链主企业' else text(''),
-            Enterprise.unicorn == '1' if qualificat == '独角兽企业' else text(''),
-
             Enterprise.high_new == '1' if qualificat == '高新技术企业' else text(''),
             Enterprise.high_new == '1' if qualificat == '高新技术企业' else text(''),
-            Enterprise.dengl == '1' if qualificat == '瞪羚企业' else text(''),
-            Enterprise.scale == '1' if qualificat == '规模以上企业' else text(''),
             Enterprise.zjtg == '1' if qualificat == '山西专精特新企业' else text(''),
             Enterprise.zjtg == '1' if qualificat == '山西专精特新企业' else text(''),
+            Enterprise.unicorn == '1' if qualificat == '独角兽企业' else text(''),
+            Enterprise.dengl == '1' if qualificat == '瞪羚企业' else text(''),
             Enterprise.tbe == '1' if qualificat == '科技型中小企业' else text(''),
             Enterprise.tbe == '1' if qualificat == '科技型中小企业' else text(''),
+            Enterprise.scale == '1' if qualificat == '规模以上企业' else text(''),
             Enterprise.sxonhun == '1' if qualificat == '山西100强企业' else text(''),
             Enterprise.sxonhun == '1' if qualificat == '山西100强企业' else text(''),
             Enterprise.serve == '1' if qualificat == '限额以上服务业企业' else text('')
             Enterprise.serve == '1' if qualificat == '限额以上服务业企业' else text('')
         )
         )
@@ -499,17 +498,19 @@ def attract_enterprise():
 
 
         df = [{"id": i.id,
         df = [{"id": i.id,
                "company_name": i.company_name,
                "company_name": i.company_name,
-               "aptitude": list(filter(None, ["高新技术企业" if i.high_new == '1' else '',
-                            "科技型中小企业" if i.tbe == '1' else '',
+               "aptitude": list(filter(None, [
+                   "中国500强" if i.isfive == '1' else '',
                    "上市企业" if i.quoted_company == '1' else '',
                    "上市企业" if i.quoted_company == '1' else '',
-                            "山西民营100强" if i.sxonhun == '1' else '',
+                   "链主企业" if i.chain_master == '1' else '',
+                   "高新技术企业" if i.high_new == '1' else '',
                    "山西专精特新企业" if i.zjtg == '1' else '',
                    "山西专精特新企业" if i.zjtg == '1' else '',
                    "独角兽企业" if i.unicorn == '1' else '',
                    "独角兽企业" if i.unicorn == '1' else '',
-                            "瞪羚" if i.dengl == '1' else '',
-                            "中国500强" if i.isfive == '1' else '',
+                   "瞪羚企业" if i.dengl == '1' else '',
+                   "科技型中小企业" if i.tbe == '1' else '',
+                   "山西民营100强" if i.sxonhun == '1' else '',
                    "规模以上企业" if i.scale == '1' else '',
                    "规模以上企业" if i.scale == '1' else '',
-                            "链主企业" if i.chain_master == '1' else '',
-                            "限额以上服务业" if i.serve == '1' else '']))
+                   "限额以上服务业" if i.serve == '1' else ''
+               ]))
                } for i in enterprise_obj_list]
                } for i in enterprise_obj_list]
         data = {"size": size, "df": df}
         data = {"size": size, "df": df}
     except Exception as e:
     except Exception as e: