Skip to content

M
mancheng
Commit 1780dda3 by dong
Options

fix20221210

parent 36cdd28c
Showing with 12 additions and 12 deletions
apps/view_atlas/view.py
...@@ -492,7 +492,7 @@ def industry_policy(): ...@@ -492,7 +492,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
InduPolicy.level == "国家级", InduPolicy.level == "国家级",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name)) InduPolicy.name.like('%{}%'.format(policy_name))
) )
...@@ -503,7 +503,7 @@ def industry_policy(): ...@@ -503,7 +503,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
InduPolicy.level == "省级", InduPolicy.level == "省级",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name))) InduPolicy.name.like('%{}%'.format(policy_name)))
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
...@@ -513,7 +513,7 @@ def industry_policy(): ...@@ -513,7 +513,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
InduPolicy.level == "市级", InduPolicy.level == "市级",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name))) InduPolicy.name.like('%{}%'.format(policy_name)))
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
...@@ -523,7 +523,7 @@ def industry_policy(): ...@@ -523,7 +523,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
InduPolicy.level == "区县", InduPolicy.level == "区县",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name))) InduPolicy.name.like('%{}%'.format(policy_name)))
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
...@@ -533,7 +533,7 @@ def industry_policy(): ...@@ -533,7 +533,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
InduPolicy.level == "开发区", InduPolicy.level == "开发区",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name))) InduPolicy.name.like('%{}%'.format(policy_name)))
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
...@@ -543,7 +543,7 @@ def industry_policy(): ...@@ -543,7 +543,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
# InduPolicy.level == "国家级", # InduPolicy.level == "国家级",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name)) InduPolicy.name.like('%{}%'.format(policy_name))
) )
...@@ -556,7 +556,7 @@ def industry_policy(): ...@@ -556,7 +556,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
InduPolicy.level == "国家级", InduPolicy.level == "国家级",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name))) InduPolicy.name.like('%{}%'.format(policy_name)))
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
...@@ -566,7 +566,7 @@ def industry_policy(): ...@@ -566,7 +566,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
InduPolicy.level == "省级", InduPolicy.level == "省级",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name))) InduPolicy.name.like('%{}%'.format(policy_name)))
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
...@@ -576,7 +576,7 @@ def industry_policy(): ...@@ -576,7 +576,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
InduPolicy.level == "市级", InduPolicy.level == "市级",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name))) InduPolicy.name.like('%{}%'.format(policy_name)))
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
...@@ -586,7 +586,7 @@ def industry_policy(): ...@@ -586,7 +586,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
InduPolicy.level == "区县", InduPolicy.level == "区县",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name))) InduPolicy.name.like('%{}%'.format(policy_name)))
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
...@@ -596,7 +596,7 @@ def industry_policy(): ...@@ -596,7 +596,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
InduPolicy.level == "开发区", InduPolicy.level == "开发区",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name))) InduPolicy.name.like('%{}%'.format(policy_name)))
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
...@@ -606,7 +606,7 @@ def industry_policy(): ...@@ -606,7 +606,7 @@ def industry_policy():
indu_policy = InduPolicy.query.filter( indu_policy = InduPolicy.query.filter(
InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.navigat.like("%{}%".format(name)),
# InduPolicy.level == "国家级", # InduPolicy.level == "国家级",
InduPolicy.org == policy_type if policy_type == '国务院' else text(''), InduPolicy.org == policy_type if policy_type else text(''),
InduPolicy.year == policy_year if policy_year else text(''), InduPolicy.year == policy_year if policy_year else text(''),
InduPolicy.name.like('%{}%'.format(policy_name)) InduPolicy.name.like('%{}%'.format(policy_name))
) )
......
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