Skip to content

M
mancheng
Commit aea07818 by dong
Options

fix20230201

parent d68a09f6
Showing with 11 additions and 11 deletions
apps/view_choose/fill_data.py
......@@ -1732,7 +1732,7 @@ def search_carrier_build():
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.district_name == district_name,
CarrierBuild.district_name == district_name if district_name != '晋城市' else text(''),
CarrierBuild.build_type.like('%{}%'.format(build_type))))
carrier_size = carrier_obj.count()
elif all([build_name, district_name]):
......@@ -1752,7 +1752,7 @@ def search_carrier_build():
# CarrierBuild.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.district_name == district_name))
CarrierBuild.district_name == district_name if district_name != '晋城市' else text('')))
carrier_size = carrier_obj.count()
elif all([build_name, build_type]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
......@@ -1789,7 +1789,7 @@ def search_carrier_build():
# CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.audit_status.in_([1, 3]))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name if district_name != '晋城市' else text('')),
CarrierBuild.build_type.like('%{}%'.format(build_type)))
carrier_size = carrier_obj.count()
elif any([build_name, district_name, build_type]):
......@@ -1827,7 +1827,7 @@ def search_carrier_build():
# CarrierBuild.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(CarrierBuild.district_name == district_name)
carrier_obj = CarrierBuild.query.filter(CarrierBuild.district_name == district_name if district_name != '晋城市' else text(''))
carrier_size = carrier_obj.count()
if build_type:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
......@@ -1945,7 +1945,7 @@ def search_carrier_land():
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.district_name == district_name,
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''),
CarrierLand.land_code.like('%{}%'.format(land_code))))
carrier_size = carrier_obj.count()
elif all([land_name, district_name]):
......@@ -1969,7 +1969,7 @@ def search_carrier_land():
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.district_name == district_name))
CarrierLand.district_name == district_name if district_name != '晋城市' else text('')))
carrier_size = carrier_obj.count()
elif all([land_name, land_code]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
......@@ -2032,7 +2032,7 @@ def search_carrier_land():
# CarrierLand.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(CarrierLand.district_name == district_name)
carrier_obj = CarrierLand.query.filter(CarrierLand.district_name == district_name if district_name != '晋城市' else text(''))
carrier_size = carrier_obj.count()
if land_code:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
......@@ -2140,7 +2140,7 @@ def search_carrier_factory():
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.district_name == district_name,
CarrierFactory.district_name == district_name if district_name != '晋城市' else text(''),
CarrierFactory.is_standard == is_standard))
carrier_size = carrier_obj.count()
elif all([factory_name, district_name]):
......@@ -2164,7 +2164,7 @@ def search_carrier_factory():
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.district_name == district_name))
CarrierFactory.district_name == district_name if district_name != '晋城市' else text('')))
carrier_size = carrier_obj.count()
elif all([factory_name, is_standard]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
......@@ -2209,7 +2209,7 @@ def search_carrier_factory():
# CarrierFactory.audit_status.in_([1, 3]))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.district_name == district_name),
and_(CarrierFactory.district_name == district_name if district_name != '晋城市' else text('')),
CarrierFactory.is_standard == is_standard)
carrier_size = carrier_obj.count()
elif any([factory_name, district_name, is_standard]):
......@@ -2251,7 +2251,7 @@ def search_carrier_factory():
# CarrierFactory.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(CarrierFactory.district_name == district_name)
carrier_obj = CarrierFactory.query.filter(CarrierFactory.district_name == district_name if district_name != '晋城市' else text(''))
carrier_size = carrier_obj.count()
if is_standard:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
......
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