Skip to content

M
mancheng
Commit df0cfb8b by dong
Options

fix20230220

parent f0d9a39b
Showing with 5 additions and 118 deletions
apps/models.py
...@@ -1782,7 +1782,7 @@ class CarrierLand(db.Model): ...@@ -1782,7 +1782,7 @@ class CarrierLand(db.Model):
tax = db.Column(db.String(20), comment='地均税收（万元/亩）') tax = db.Column(db.String(20), comment='地均税收（万元/亩）')
linkman = db.Column(db.String(20), comment='联系人') linkman = db.Column(db.String(20), comment='联系人')
telephone = db.Column(db.String(20), comment='联系方式') telephone = db.Column(db.String(20), comment='联系方式')
red_line_map = db.Column(db.String(20), comment='用地红线图') price_url = db.Column(db.String(20), comment='用地红线图')
other_requirements = db.Column(db.String(20), comment='其他要求') other_requirements = db.Column(db.String(20), comment='其他要求')
...@@ -1832,7 +1832,9 @@ class CarrierBuild(db.Model): ...@@ -1832,7 +1832,9 @@ class CarrierBuild(db.Model):
wuye_money = db.Column(db.String(20), comment='物业费（元/平米/月）') wuye_money = db.Column(db.String(20), comment='物业费（元/平米/月）')
linkman = db.Column(db.String(20), comment='联系人') linkman = db.Column(db.String(20), comment='联系人')
link_mobile = db.Column(db.String(20), comment='联系方式') link_mobile = db.Column(db.String(20), comment='联系方式')
build_pic = db.Column(db.String(20), comment='楼宇图片') inside_picture_url = db.Column(db.String(255), comment='内部照片url')
outer_picture_url = db.Column(db.String(255), comment='外部照片url')
price_url = db.Column(db.String(255), comment='平面图url')
# 产业载体-厂房数据 # 产业载体-厂房数据
...@@ -1883,6 +1885,7 @@ class CarrierFactory(db.Model): ...@@ -1883,6 +1885,7 @@ class CarrierFactory(db.Model):
audit_status = db.Column(db.String(20), comment='审核状态 0为未审核；1为审核通过；2为提交；3为驳回；4未通过；') audit_status = db.Column(db.String(20), comment='审核状态 0为未审核；1为审核通过；2为提交；3为驳回；4未通过；')
audit_message = db.Column(db.String(50), comment='审核附言') audit_message = db.Column(db.String(50), comment='审核附言')
# 载体资源库-产业地图-各载体类型面积数据表 # 载体资源库-产业地图-各载体类型面积数据表
# class CarrierArea(db.Model): # class CarrierArea(db.Model):
# __tablename_ = "carrier_area" # __tablename_ = "carrier_area"
......
apps/view_choose/fill_data.py
...@@ -1923,148 +1923,32 @@ def search_carrier_land(): ...@@ -1923,148 +1923,32 @@ def search_carrier_land():
carrier_size = '' carrier_size = ''
try: try:
if all([district_name, land_name, land_code]): if all([district_name, land_name, land_code]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter( carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)), and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''), CarrierLand.district_name == district_name if district_name != '晋城市' else text(''),
CarrierLand.land_code.like('%{}%'.format(land_code)))) CarrierLand.land_code.like('%{}%'.format(land_code))))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif all([land_name, district_name]): elif all([land_name, district_name]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter( carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)), and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''))) CarrierLand.district_name == district_name if district_name != '晋城市' else text('')))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif all([land_name, land_code]): elif all([land_name, land_code]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter( carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)), and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.land_code.like('%{}%'.format(land_code)))) CarrierLand.land_code.like('%{}%'.format(land_code))))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif any([district_name, land_name, land_code]): elif any([district_name, land_name, land_code]):
if land_name: if land_name:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.upload_people_id == user_id))
#
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.upload_people_belong == belong_unit))
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(CarrierLand.land_name.like('%{}%'.format(land_name))) carrier_obj = CarrierLand.query.filter(CarrierLand.land_name.like('%{}%'.format(land_name)))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
if district_name: if district_name:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.district_name == district_name,
# CarrierLand.upload_people_id == user_id))
#
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.district_name == district_name,
# CarrierLand.upload_people_belong == belong_unit))
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.district_name == district_name,
# CarrierLand.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(CarrierLand.district_name == district_name if district_name != '晋城市' else text('')) carrier_obj = CarrierLand.query.filter(CarrierLand.district_name == district_name if district_name != '晋城市' else text(''))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
if land_code: if land_code:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_belong == belong_unit))
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(CarrierLand.land_code.like('%{}%'.format(land_code))) carrier_obj = CarrierLand.query.filter(CarrierLand.land_code.like('%{}%'.format(land_code)))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
else: # 无参数，搜索全部 else: # 无参数，搜索全部
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(CarrierLand.upload_people_id == user_id)
#
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(CarrierLand.upload_people_belong == belong_unit)
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierLand.query.filter(CarrierLand.audit_status.in_([1, 3]))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(CarrierLand.id > 0) carrier_obj = CarrierLand.query.filter(CarrierLand.id > 0)
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
land_obj_list = carrier_obj.order_by(CarrierLand.upload_time.desc()).paginate(page, per_page).items land_obj_list = carrier_obj.order_by(CarrierLand.upload_time.desc()).paginate(page, per_page).items
......
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