Skip to content

M
mancheng
Commit 19e37671 by dong
Options

fix20230228

parent 4b1355ab
Showing with 255 additions and 236 deletions
apps/models.py
...@@ -1666,6 +1666,7 @@ class CarrierBuild(db.Model): ...@@ -1666,6 +1666,7 @@ class CarrierBuild(db.Model):
is_internet = db.Column(db.String(20), comment='是否已通网络(是/否)') is_internet = db.Column(db.String(20), comment='是否已通网络(是/否)')
is_divide = db.Column(db.String(20), comment='是否可以分割(是/否)') is_divide = db.Column(db.String(20), comment='是否可以分割(是/否)')
attract_status = db.Column(db.String(20), comment='拟招引产业') attract_status = db.Column(db.String(20), comment='拟招引产业')
other_attract_status = db.Column(db.String(20), comment='其他产业名称')
cooperation_model = db.Column(db.String(20), comment='合作模式(出租/出售/转让)') cooperation_model = db.Column(db.String(20), comment='合作模式(出租/出售/转让)')
rent_money = db.Column(db.String(20), comment='租金（元/平米/天）') rent_money = db.Column(db.String(20), comment='租金（元/平米/天）')
wuye_money = db.Column(db.String(20), comment='物业费（元/平米/月）') wuye_money = db.Column(db.String(20), comment='物业费（元/平米/月）')
......
apps/view_choose/fill_data.py
...@@ -96,14 +96,13 @@ def get_transfer_year_id(transfer_year): ...@@ -96,14 +96,13 @@ def get_transfer_year_id(transfer_year):
def show_all(): def show_all():
req_dic = request.get_json() req_dic = request.get_json()
carrier_type = req_dic['carrier_type'] carrier_type = req_dic['carrier_type']
# token = req_dic['token'] # token = request.headers['token']
token = request.headers['token']
action_name = '默认展示数据' action_name = '默认展示数据'
try: # try:
section, user_name, operation_mobile, user_id, belong_unit = verify_identity(token, action_name) # section, user_name, operation_mobile, user_id, belong_unit = verify_identity(token, action_name)
except Exception as e: # except Exception as e:
current_app.logger.error(e) # current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="进行访问 {} 操作时用户信息校验失败，请重新登陆后尝试！".format(action_name)) # return jsonify(code=RET.SESSIONERR, msg="进行访问 {} 操作时用户信息校验失败，请重新登陆后尝试！".format(action_name))
page = req_dic['page'] page = req_dic['page']
per_page = req_dic['per_page'] per_page = req_dic['per_page']
...@@ -1839,36 +1838,43 @@ def search_carrier_build(): ...@@ -1839,36 +1838,43 @@ def search_carrier_build():
carrier_obj = '' carrier_obj = ''
try: try:
if all([build_name, district_name, build_type]): # if all([build_name, district_name, build_type]):
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.district_name == district_name if district_name != '晋城市' else text(''), # CarrierBuild.district_name == district_name if district_name != '晋城市' else text(''),
CarrierBuild.build_type.like('%{}%'.format(build_type)))) # CarrierBuild.build_type.like('%{}%'.format(build_type))))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
elif all([build_name, district_name]): # elif all([build_name, district_name]):
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.district_name == district_name if district_name != '晋城市' else text(''))) # CarrierBuild.district_name == district_name if district_name != '晋城市' else text('')))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
elif all([build_name, build_type]): # elif all([build_name, build_type]):
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.build_type.like('%{}%'.format(build_type)))) # CarrierBuild.build_type.like('%{}%'.format(build_type))))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
elif all([district_name, build_type]): # elif all([district_name, build_type]):
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name if district_name != '晋城市' else text('')), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name if district_name != '晋城市' else text('')),
CarrierBuild.build_type.like('%{}%'.format(build_type))) # CarrierBuild.build_type.like('%{}%'.format(build_type)))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
elif any([build_name, district_name, build_type]): # elif any([build_name, district_name, build_type]):
if build_name: # if build_name:
carrier_obj = CarrierBuild.query.filter(CarrierBuild.build_name.like('%{}%'.format(build_name))) # carrier_obj = CarrierBuild.query.filter(CarrierBuild.build_name.like('%{}%'.format(build_name)))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if district_name: # if district_name:
carrier_obj = CarrierBuild.query.filter(CarrierBuild.district_name == district_name if district_name != '晋城市' else text('')) # carrier_obj = CarrierBuild.query.filter(CarrierBuild.district_name == district_name if district_name != '晋城市' else text(''))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if build_type: # if build_type:
carrier_obj = CarrierBuild.query.filter(CarrierBuild.build_type.like('%{}%'.format(build_type))) # carrier_obj = CarrierBuild.query.filter(CarrierBuild.build_type.like('%{}%'.format(build_type)))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
else: # 无参数，搜索全部 # else: # 无参数，搜索全部
carrier_obj = CarrierBuild.query.filter(CarrierBuild.id > 0) # carrier_obj = CarrierBuild.query.filter(CarrierBuild.id > 0)
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(
CarrierBuild.build_name.like('%{}%'.format(build_name) if build_name else text('')),
CarrierBuild.district_name == district_name if district_name != '晋城市' and '开发区' not in district_name else text(''),
CarrierBuild.development_area == district_name if district_name.endswith('开发区') else text(''),
CarrierBuild.build_type.like('%{}%'.format(build_type)) if build_type else text(''))
carrier_size = carrier_obj.count()
build_obj_list = carrier_obj.order_by(CarrierBuild.upload_time.desc()).paginate(page, per_page).items build_obj_list = carrier_obj.order_by(CarrierBuild.upload_time.desc()).paginate(page, per_page).items
if build_obj_list: if build_obj_list:
...@@ -1928,35 +1934,41 @@ def search_carrier_land(): ...@@ -1928,35 +1934,41 @@ def search_carrier_land():
per_page = req_dic['per_page'] per_page = req_dic['per_page']
carrier_size = '' carrier_size = ''
try: try:
if all([district_name, land_name, land_code]): # if all([district_name, land_name, land_code]):
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]):
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]):
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:
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:
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:
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: # 无参数，搜索全部
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()
carrier_obj = CarrierLand.query.filter(
CarrierLand.land_name.like('%{}%'.format(land_name) if land_name else text('')),
CarrierLand.district_name == district_name if district_name != '晋城市' and '开发区' not in district_name else text(''),
CarrierLand.development_area == district_name if district_name.endswith('开发区') else text(''),
CarrierLand.land_code.like('%{}%'.format(land_code)) if land_code else text(''))
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
if land_obj_list: if land_obj_list:
data = [{ data = [{
...@@ -2006,176 +2018,182 @@ def search_carrier_factory(): ...@@ -2006,176 +2018,182 @@ def search_carrier_factory():
carrier_size = '' carrier_size = ''
carrier_obj = '' carrier_obj = ''
try: try:
if all([district_name, factory_name, is_standard]): # if all([district_name, factory_name, is_standard]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容 # # if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.district_name == district_name, # # CarrierFactory.district_name == district_name,
# CarrierFactory.is_standard == is_standard, # # CarrierFactory.is_standard == is_standard,
# CarrierFactory.upload_people_id == user_id)) # # CarrierFactory.upload_people_id == user_id))
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.district_name == district_name, # # CarrierFactory.district_name == district_name,
# CarrierFactory.is_standard == is_standard, # # CarrierFactory.is_standard == is_standard,
# CarrierFactory.upload_people_belong == belong_unit)) # # CarrierFactory.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过的内容 # # if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.district_name == district_name, # # CarrierFactory.district_name == district_name,
# CarrierFactory.is_standard == is_standard, # # CarrierFactory.is_standard == is_standard,
# CarrierFactory.audit_status.in_([1, 3]))) # # CarrierFactory.audit_status.in_([1, 3])))
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.district_name == district_name if district_name != '晋城市' else text(''), # CarrierFactory.district_name == district_name if district_name != '晋城市' else text(''),
CarrierFactory.is_standard == is_standard)) # CarrierFactory.is_standard == is_standard))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
elif all([factory_name, district_name]): # elif all([factory_name, district_name]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容 # # if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.district_name == district_name, # # CarrierFactory.district_name == district_name,
# CarrierFactory.upload_people_id == user_id)) # # CarrierFactory.upload_people_id == user_id))
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.district_name == district_name, # # CarrierFactory.district_name == district_name,
# CarrierFactory.upload_people_belong == belong_unit)) # # CarrierFactory.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过的内容 # # if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.district_name == district_name, # # CarrierFactory.district_name == district_name,
# CarrierFactory.audit_status.in_([1, 3]))) # # CarrierFactory.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.district_name == district_name if district_name != '晋城市' else text(''))) # CarrierFactory.district_name == district_name if district_name != '晋城市' else text('')))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
elif all([factory_name, is_standard]): # elif all([factory_name, is_standard]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容 # # if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.is_standard == is_standard, # # CarrierFactory.is_standard == is_standard,
# CarrierFactory.upload_people_id == user_id)) # # CarrierFactory.upload_people_id == user_id))
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.is_standard == is_standard, # # CarrierFactory.is_standard == is_standard,
# CarrierFactory.upload_people_belong == belong_unit)) # # CarrierFactory.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.is_standard == is_standard, # # CarrierFactory.is_standard == is_standard,
# CarrierFactory.audit_status.in_([1, 3]))) # # CarrierFactory.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.is_standard == is_standard)) # CarrierFactory.is_standard == is_standard))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
elif all([district_name, is_standard]): # elif all([district_name, is_standard]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容 # # if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.district_name == district_name), # # and_(CarrierFactory.district_name == district_name),
# CarrierFactory.is_standard == is_standard, # # CarrierFactory.is_standard == is_standard,
# CarrierFactory.upload_people_id == user_id) # # CarrierFactory.upload_people_id == user_id)
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.district_name == district_name), # # and_(CarrierFactory.district_name == district_name),
# CarrierFactory.is_standard == is_standard, # # CarrierFactory.is_standard == is_standard,
# CarrierFactory.upload_people_belong == belong_unit) # # CarrierFactory.upload_people_belong == belong_unit)
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.district_name == district_name), # # and_(CarrierFactory.district_name == district_name),
# CarrierFactory.is_standard == is_standard, # # CarrierFactory.is_standard == is_standard,
# CarrierFactory.audit_status.in_([1, 3])) # # CarrierFactory.audit_status.in_([1, 3]))
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.district_name == district_name if district_name != '晋城市' else text('')), # and_(CarrierFactory.district_name == district_name if district_name != '晋城市' else text('')),
CarrierFactory.is_standard == is_standard) # CarrierFactory.is_standard == is_standard)
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
elif any([factory_name, district_name, is_standard]): # elif any([factory_name, district_name, is_standard]):
if factory_name: # if factory_name:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容 # # if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.upload_people_id == user_id)) # # CarrierFactory.upload_people_id == user_id))
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.upload_people_belong == belong_unit)) # # CarrierFactory.upload_people_belong == belong_unit))
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierFactory.query.filter( # # carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.audit_status.in_([1, 3]))) # # CarrierFactory.audit_status.in_([1, 3])))
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
CarrierFactory.factory_name.like('%{}%'.format(factory_name))) # CarrierFactory.factory_name.like('%{}%'.format(factory_name)))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if district_name: # if district_name:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容 # # if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name, # # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
# CarrierFactory.upload_people_id == user_id)) # # CarrierFactory.upload_people_id == user_id))
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name, # # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
# CarrierFactory.upload_people_belong == belong_unit)) # # CarrierFactory.upload_people_belong == belong_unit))
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name, # # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
# CarrierFactory.audit_status.in_([1, 3]))) # # CarrierFactory.audit_status.in_([1, 3])))
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(CarrierFactory.district_name == district_name if district_name != '晋城市' else text('')) # carrier_obj = CarrierFactory.query.filter(CarrierFactory.district_name == district_name if district_name != '晋城市' else text(''))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if is_standard: # if is_standard:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容 # # if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard, # # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
# CarrierFactory.upload_people_id == user_id)) # # CarrierFactory.upload_people_id == user_id))
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard, # # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
# CarrierFactory.upload_people_belong == belong_unit)) # # CarrierFactory.upload_people_belong == belong_unit))
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard, # # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
# CarrierFactory.audit_status.in_([1, 3]))) # # CarrierFactory.audit_status.in_([1, 3])))
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(CarrierFactory.is_standard == is_standard) # carrier_obj = CarrierFactory.query.filter(CarrierFactory.is_standard == is_standard)
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
else: # 无参数，搜索全部 # else: # 无参数，搜索全部
# if role_id == 3: # 如果是办事员智能看到自己提报的内容 # # if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_id == user_id) # # carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_id == user_id)
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_belong == belong_unit) # # carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_belong == belong_unit)
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierFactory.query.filter(CarrierFactory.audit_status.in_([1, 3])) # # carrier_obj = CarrierFactory.query.filter(CarrierFactory.audit_status.in_([1, 3]))
# # #
# carrier_size = carrier_obj.count() # # carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(CarrierFactory.id > 0) # carrier_obj = CarrierFactory.query.filter(CarrierFactory.id > 0)
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name) if factory_name else text('')),
CarrierFactory.district_name == district_name if district_name != '晋城市' and '开发区' not in district_name else text(''),
CarrierFactory.development_area == district_name if district_name.endswith('开发区') else text(''),
CarrierFactory.is_standard == is_standard) if is_standard else text(''))
carrier_size = carrier_obj.count()
factory_obj_list = carrier_obj.order_by(CarrierFactory.upload_time.desc()).paginate(page, per_page).items factory_obj_list = carrier_obj.order_by(CarrierFactory.upload_time.desc()).paginate(page, per_page).items
if factory_obj_list: if factory_obj_list:
data = [{ data = [{
......
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