fix202302014

apps/view_atlas/view.py

@@ -108,35 +108,6 @@ def industry_cluster():
     return jsonify(code=RET.OK, msg="获取成功", data=result)
 
 
-def get_count(industry_id, chain_name, flag):
-    company_count = ''
-    if flag == 1:  # 晋城
-        if chain_name in ["钢铁", "光机电", "煤层气", "装备制造", "铸造",
-                                 "煤化工", "新材料", "绿色建材", "医药", "丝麻纺织服装",
-                                 "现代服务业", "数字经济", "文化旅游"]:
-            company_count = Company.query.filter(
-                # Company.product_all.like('%{}%'.format(chain_name)),
-                Company.c_type == industry_id
-            ).count()
-        else:
-            company_count = Company.query.filter(
-                Company.product_all.like('%{}%'.format(chain_name)),
-                Company.c_type == industry_id,
-            ).count()
-    if flag == 2:  # 全国
-        if chain_name in ["钢铁", "光机电", "煤层气", "装备制造", "铸造",
-                          "煤化工", "新材料", "绿色建材", "医药", "丝麻纺织服装",
-                          "现代服务业", "数字经济", "文化旅游"]:
-            company_count = Enterprise.query.filter(
-                # Enterprise.product_all.like('%{}%'.format(chain_name)),
-                Enterprise.c_type == industry_id
-            ).count()
-        else:
-            company_count = Enterprise.query.filter(
-                Enterprise.product_all.like('%{}%'.format(chain_name)),
-                Enterprise.c_type == industry_id,
-            ).count()
-    return company_count
 # def get_count(industry_id, chain_name, flag):
 #     company_count = ''
 #     if flag == 1:  # 晋城
@@ -156,15 +127,44 @@ def get_count(industry_id, chain_name, flag):
 #         if chain_name in ["钢铁", "光机电", "煤层气", "装备制造", "铸造",
 #                           "煤化工", "新材料", "绿色建材", "医药", "丝麻纺织服装",
 #                           "现代服务业", "数字经济", "文化旅游"]:
-#             chain_obj = IndustryChain.query.get(id=industry_id)
-#             company_count = chain_obj.enterprise_num
+#             company_count = Enterprise.query.filter(
+#                 # Enterprise.product_all.like('%{}%'.format(chain_name)),
+#                 Enterprise.c_type == industry_id
+#             ).count()
 #         else:
-#             chain_obj = IndustryChain.query.filter(
-#                 IndustryChain.industry_name == chain_name,
-#                 IndustryChain.chain_id == industry_id,
-#             ).first()
-#             company_count = chain_obj.enterprise_num
+#             company_count = Enterprise.query.filter(
+#                 Enterprise.product_all.like('%{}%'.format(chain_name)),
+#                 Enterprise.c_type == industry_id,
+#             ).count()
 #     return company_count
+def get_count(industry_id, chain_name, flag):
+    company_count = ''
+    if flag == 1:  # 晋城
+        if chain_name in ["钢铁", "光机电", "煤层气", "装备制造", "铸造",
+                                 "煤化工", "新材料", "绿色建材", "医药", "丝麻纺织服装",
+                                 "现代服务业", "数字经济", "文化旅游"]:
+            company_count = Company.query.filter(
+                # Company.product_all.like('%{}%'.format(chain_name)),
+                Company.c_type == industry_id
+            ).count()
+        else:
+            company_count = Company.query.filter(
+                Company.product_all.like('%{}%'.format(chain_name)),
+                Company.c_type == industry_id,
+            ).count()
+    if flag == 2:  # 全国
+        if chain_name in ["钢铁", "光机电", "煤层气", "装备制造", "铸造",
+                          "煤化工", "新材料", "绿色建材", "医药", "丝麻纺织服装",
+                          "现代服务业", "数字经济", "文化旅游"]:
+            chain_obj = IndustryChain.query.get(id=industry_id)
+            company_count = chain_obj.enterprise_num
+        else:
+            chain_obj = IndustryChain.query.filter(
+                IndustryChain.industry_name == chain_name,
+                IndustryChain.chain_id == industry_id,
+            ).first()
+            company_count = chain_obj.enterprise_num
+    return company_count
 
 
 # def find_up_thr1(industry_type, industry_id):