Skip to content

M
mancheng
Commit db6ec77a by 赵宇
Options

fix

parent 32fd0bf3
Showing with 21 additions and 11 deletions
apps/view_atlas/view.py
...@@ -423,44 +423,54 @@ def industry_policy(): ...@@ -423,44 +423,54 @@ def industry_policy():
if policy_level == 1: # 国家级 if policy_level == 1: # 国家级
indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="国家级") indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="国家级")
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
indu_policy = indu_policy.paginate(page, perpage).items # indu_policy = indu_policy.
indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
if policy_level == 2: # 省级 if policy_level == 2: # 省级
indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="省级") indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="省级")
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
indu_policy = indu_policy.paginate(page, perpage).items # indu_policy = indu_policy.
indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
if policy_level == 3: # 市级 if policy_level == 3: # 市级
indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="市级") indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="市级")
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
indu_policy = indu_policy.paginate(page, perpage).items # indu_policy = indu_policy.
indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
if policy_level == 4: # 区县 if policy_level == 4: # 区县
indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="区县") indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="区县")
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
indu_policy = indu_policy.paginate(page, perpage).items # indu_policy = indu_policy.
indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
if policy_level == 5: # 开发区 if policy_level == 5: # 开发区
indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="开发区") indu_policy = InduPolicy.query.filter(InduPolicy.navigator.like("%{}%".format(name)), InduPolicy.level=="开发区")
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
indu_policy = indu_policy.paginate(page, perpage).items # indu_policy = indu_policy.
indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
if industry_level == 2: if industry_level == 2:
if policy_level == 1: # 国家级 if policy_level == 1: # 国家级
indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="国家级") indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="国家级")
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
indu_policy = indu_policy.paginate(page, perpage).items # indu_policy = indu_policy.
indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
if policy_level == 2: # 省级 if policy_level == 2: # 省级
indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="省级") indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="省级")
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
indu_policy = indu_policy.paginate(page, perpage).items # indu_policy = indu_policy.
indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
if policy_level == 3: # 市级 if policy_level == 3: # 市级
indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="市级") indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="市级")
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
indu_policy = indu_policy.paginate(page, perpage).items # indu_policy = indu_policy.
indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
if policy_level == 4: # 区县 if policy_level == 4: # 区县
indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="区县") indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="区县")
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
indu_policy = indu_policy.paginate(page, perpage).items # indu_policy = indu_policy.
indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
if policy_level == 5: # 开发区 if policy_level == 5: # 开发区
indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="开发区") indu_policy = InduPolicy.query.filter(InduPolicy.navigat.like("%{}%".format(name)), InduPolicy.level=="开发区")
size = indu_policy.count() # 分页总数 size = indu_policy.count() # 分页总数
indu_policy = indu_policy.paginate(page, perpage).items # indu_policy = indu_policy.
indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据库查询错误") return jsonify(code=RET.DBERR, msg="数据库查询错误")
...@@ -470,7 +480,7 @@ def industry_policy(): ...@@ -470,7 +480,7 @@ def industry_policy():
"id": i.id, "id": i.id,
"name": i.name, "name": i.name,
"org": i.org, "org": i.org,
"pubdate": (i.pubdate).strftime("%Y-%m-%d %H:%M:%S") "pubdate": (i.pubdate).strftime("%Y-%m-%d")
} for i in indu_policy], } for i in indu_policy],
"size": size "size": size
} }
......
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