Skip to content

M
mancheng
Commit f0d9a39b by dong
Options

fix20230220

parent e88e0689
Showing with 205 additions and 350 deletions
apps/view_choose/fill_data.py
...@@ -1358,28 +1358,32 @@ def carrier_detail(): ...@@ -1358,28 +1358,32 @@ def carrier_detail():
if carrier_type == 1: if carrier_type == 1:
carrier_obj = CarrierBuild.query.filter_by(id=carrier_id).first() carrier_obj = CarrierBuild.query.filter_by(id=carrier_id).first()
data = [{"id": carrier_obj.id, data = [{"id": carrier_obj.id,
"construction_time": carrier_obj.construction_time, "build_name": carrier_obj.build_name, # 楼宇名称
"district_name": carrier_obj.district_name, "district_name": carrier_obj.district_name, # 所属县区
"build_name": carrier_obj.build_name, "development_area": carrier_obj.development_area, # 所属开发区
"detail_address": carrier_obj.detail_address, "build_type": carrier_obj.build_type, # 楼宇类型(商铺/写字楼/其他)
"cover_land_area": carrier_obj.cover_land_area, "level": carrier_obj.level, # 写字楼等级（甲/乙/其他）
"layer_num": carrier_obj.layer_num, "detail_address": carrier_obj.detail_address, # 详细地址（地址需填写准确、详细、精准）
"car_space_num": carrier_obj.car_space_num, "construction_time": carrier_obj.construction_time, # 建成时间（年）
"lift_num": carrier_obj.lift_num, "cover_land_area": carrier_obj.cover_land_area, # 总占地面积（㎡）
"build_area": carrier_obj.build_area, "build_area": carrier_obj.build_area, # 总建筑面积（㎡）
"empty_area": carrier_obj.empty_area, "single_area": carrier_obj.single_area, # 单层面积（㎡）
"build_type": carrier_obj.build_type, "empty_area": carrier_obj.empty_area, # 闲置面积（㎡）
# "build_structure": carrier_obj.build_structure, "layer_num": carrier_obj.layer_num, # 总层数
# "owner": carrier_obj.owner, "car_space_num": carrier_obj.car_space_num, # 车位（个）
"linkman": carrier_obj.linkman, "lift_num": carrier_obj.lift_num, # 电梯（部）
"link_mobile": carrier_obj.link_mobile, "is_water": carrier_obj.is_water, # 是否已通水(是/否)
"attract_status": carrier_obj.attract_status, # 拟招引状态 "is_electric": carrier_obj.is_electric, # 是否已通电(是/否)
"rent_money": carrier_obj.rent_money, # 租金 "is_warm": carrier_obj.is_warm, # 是否已通暖(是/否)
"cooperation_model": carrier_obj.cooperation_model, # 合作模式 "is_gas": carrier_obj.is_gas, # 是否已通燃气(是/否)
# "details": carrier_obj.build_info, # 楼宇介绍 "is_internet": carrier_obj.is_internet, # 是否已通网络(是/否)
"wuye_money": carrier_obj.wuye_money, # 物业费 "is_divide": carrier_obj.is_divide, # 是否可以分割(是/否)
"attract_advantage": carrier_obj.attract_advantage, # 招商优势 "attract_status": carrier_obj.attract_status, # 拟招引产业
"policy": carrier_obj.policy, # 优惠政策 "cooperation_model": carrier_obj.cooperation_model, # 合作模式(出租/出售/转让)
"rent_money": carrier_obj.rent_money, # 租金（元/平米/天）
"wuye_money": carrier_obj.wuye_money, # 物业费（元/平米/月）
"linkman": carrier_obj.linkman, # 联系人
"link_mobile": carrier_obj.link_mobile, # 联系方式
"inside_picture_url": [ "inside_picture_url": [
{"url": carrier_obj.inside_picture_url}] if carrier_obj.inside_picture_url else [], {"url": carrier_obj.inside_picture_url}] if carrier_obj.inside_picture_url else [],
"outer_picture_url": [ "outer_picture_url": [
...@@ -1393,23 +1397,27 @@ def carrier_detail(): ...@@ -1393,23 +1397,27 @@ def carrier_detail():
if carrier_type == 2: if carrier_type == 2:
carrier_obj = CarrierLand.query.filter_by(id=carrier_id).first() carrier_obj = CarrierLand.query.filter_by(id=carrier_id).first()
data = [{"id": carrier_obj.id, data = [{"id": carrier_obj.id,
"district_name": carrier_obj.district_name, "land_name": carrier_obj.land_name, # 土地名称
"land_name": carrier_obj.land_name, "land_code": carrier_obj.land_code, # 土地编码
"land_code": carrier_obj.land_code, "district_name": carrier_obj.district_name, # 所属县区
"land_nature": carrier_obj.land_nature, "development_area": carrier_obj.development_area, # 所属开发区
# "land_status": carrier_obj.land_status, "detail_address": carrier_obj.detail_address, # 土地位置
# "linkman": carrier_obj.linkman, "land_use": carrier_obj.land_use, # 用地四至
# "link_mobile": carrier_obj.link_mobile, "land_nature": carrier_obj.land_nature, # 用地性质(工业用地/商服用地/物流仓储用地/科研用地/居住用地)（包括用地性质类别代码）
"detail_address": carrier_obj.detail_address, "total_area": carrier_obj.total_area, # 用地面积（净用地面积）（公顷）
"total_area": carrier_obj.total_area, "surface_area": carrier_obj.surface_area, # 地上控制建面（㎡）
# "plot_ratio": carrier_obj.plot_ratio, "plot_ratio": carrier_obj.plot_ratio, # 容积率
# "jing_area": carrier_obj.jing_area, "greening_rate": carrier_obj.greening_rate, # 绿化率
# "sales_price": carrier_obj.sales_price, "density": carrier_obj.density, # 建筑密度
# "max_sales_price": carrier_obj.max_sales_price, "height_permitted": carrier_obj.height_permitted, # 限高（㎡）
# "max_car_space_price": carrier_obj.max_car_space_price, "transfer_year": carrier_obj.transfer_year, # 出让年限
# "transfer_year": carrier_obj.transfer_year, "develop_degree": carrier_obj.develop_degree, # 用地开发程度（请详细描述几通一平）
# "industry_type": carrier_obj.industry_type, "investment_intensity": carrier_obj.investment_intensity, # 投资强度（万元/亩）
# "plan_target": carrier_obj.plan_target, "output_intensity": carrier_obj.output_intensity, # 产出强度（万元/亩）
"tax": carrier_obj.tax, # 地均税收（万元/亩）
"linkman": carrier_obj.linkman, # 联系人
"telephone": carrier_obj.telephone, # 联系方式
"other_requirements": carrier_obj.other_requirements, # 其他要求
"price_url": [ "price_url": [
{"url": carrier_obj.price_url}] if carrier_obj.price_url else [], {"url": carrier_obj.price_url}] if carrier_obj.price_url else [],
}] }]
...@@ -1418,34 +1426,34 @@ def carrier_detail(): ...@@ -1418,34 +1426,34 @@ def carrier_detail():
if carrier_type == 3: if carrier_type == 3:
carrier_obj = CarrierFactory.query.filter_by(id=carrier_id).first() carrier_obj = CarrierFactory.query.filter_by(id=carrier_id).first()
data = [{"id": carrier_obj.id, data = [{"id": carrier_obj.id,
"district_name": carrier_obj.district_name, "factory_name": carrier_obj.factory_name, # 厂房名称
"factory_name": carrier_obj.factory_name, "district_name": carrier_obj.district_name, # 所属县区
"is_standard": str(carrier_obj.is_standard), "development_area": str(carrier_obj.development_area), # 所属开发区
"rent_money": carrier_obj.rent_money, "build_type": carrier_obj.build_type, # 厂房类型（单层/多层/混合层）
"construction_time": carrier_obj.construction_time, "is_standard": carrier_obj.is_standard, # 是否标准化厂房(是/否)
"detail_address": carrier_obj.detail_address, "detail_address": carrier_obj.detail_address, # 详细地址（地址需填写准确、详细、精准）
# "owner": carrier_obj.owner, "construction_time": carrier_obj.construction_time, # 建成时间（年）
"cover_land_area": carrier_obj.cover_land_area, "cover_land_area": carrier_obj.cover_land_area, # 总占地面积（㎡）
"factory_area": carrier_obj.factory_area, "factory_area": carrier_obj.factory_area, # 总建筑面积（㎡）
"empty_area": carrier_obj.empty_area, "empty_area": carrier_obj.empty_area, # 闲置面积（㎡）
"factory_structure": carrier_obj.factory_structure, "layer_num": carrier_obj.layer_num, # 总层数
"width": carrier_obj.width, "factory_structure": carrier_obj.factory_structure, # 建筑结构（混凝土框架、钢结构、砖混、砖混钢筋、钢筋混凝土、轻钢）
"high": carrier_obj.high, "width": carrier_obj.width, # 跨度（m）
"bearing": carrier_obj.bearing, "high": carrier_obj.high, # 层高（m）
"linkman": carrier_obj.linkman, "bearing": carrier_obj.bearing, # 承重（kg/㎡）
"link_mobile": carrier_obj.link_mobile, # 拟招引状态 "is_water": str(carrier_obj.is_water), # 是否已通水(是/否)
"is_electric": str(carrier_obj.is_electric), # 租金 "is_electric": str(carrier_obj.is_electric), # 是否已通电(是/否)
"is_water": str(carrier_obj.is_water), # 合作模式 "is_warm": str(carrier_obj.is_warm), # 是否已通暖(是/否)
"is_warm": str(carrier_obj.is_warm), # 合作模式 "is_gas": str(carrier_obj.is_gas), # 是否已通燃气(是/否)
"is_gas": str(carrier_obj.is_gas), # 合作模式 "is_network": str(carrier_obj.is_network), # 是否已通网络(是/否)
"is_network": str(carrier_obj.is_network), # 合作模式 "is_car": str(carrier_obj.is_car), # 是否可安装天车
"lift_num": str(carrier_obj.lift_num), # 合作模式 "lift_num": str(carrier_obj.lift_num), # 电梯(部)
"layer_num": str(carrier_obj.layer_num), # 合作模式 "attract_status": carrier_obj.attract_status, # 拟招引产业
"attract_status": carrier_obj.attract_status, # 拟招引状态 "settled_enterprise": carrier_obj.settled_enterprise, # 已入驻企业（企业全称，使用面积）
"cooperation_model": carrier_obj.cooperation_model, # 合作模式 "cooperation_model": carrier_obj.cooperation_model, # 合作模式(出租/出售/转让)
"attract_advantage": carrier_obj.attract_advantage, # 招商优势 "rent_money": carrier_obj.rent_money, # 租金（元/平米/天）
"policy": carrier_obj.policy, # 相关政策 "linkman": carrier_obj.linkman, # 联系人
# "property_type": carrier_obj.property_type, # 产权类型 "link_mobile": carrier_obj.link_mobile, # 联系方式
"inside_picture_url": [ "inside_picture_url": [
{"url": carrier_obj.inside_picture_url}] if carrier_obj.inside_picture_url else [], {"url": carrier_obj.inside_picture_url}] if carrier_obj.inside_picture_url else [],
"outer_picture_url": [ "outer_picture_url": [
...@@ -1466,7 +1474,6 @@ def carrier_detail(): ...@@ -1466,7 +1474,6 @@ def carrier_detail():
def carrier_edit_build(): def carrier_edit_build():
# 获取编辑后的数据 # 获取编辑后的数据
req_dic = request.get_json() req_dic = request.get_json()
# token = req_dic['token']
token = request.headers['token'] token = request.headers['token']
action_name = '编辑修改楼宇数据' action_name = '编辑修改楼宇数据'
try: try:
...@@ -1475,13 +1482,6 @@ def carrier_edit_build(): ...@@ -1475,13 +1482,6 @@ def carrier_edit_build():
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))
# if role_id == 3: # 如果是办事员可以编辑自己提报的内容
# pass
# if role_id == 2: # 市直部门这区县领导可以编辑该部门所有办事员提报的内容
# pass
# if role_id == 1: # 局领导能看到所有审核通过的内容
# return jsonify(code=RET.THIRDERR, msg="局领导不能编辑数据。")
build_id = req_dic['id'] build_id = req_dic['id']
construction_time = req_dic['construction_time'] construction_time = req_dic['construction_time']
district_name = req_dic['district_name'] district_name = req_dic['district_name']
...@@ -1489,84 +1489,73 @@ def carrier_edit_build(): ...@@ -1489,84 +1489,73 @@ def carrier_edit_build():
detail_address = req_dic['detail_address'] detail_address = req_dic['detail_address']
if not all([district_name, build_name, detail_address]): if not all([district_name, build_name, detail_address]):
return jsonify(code=RET.PARAMERR, msg="所属区县、载体名称、详细地址不能为空！") return jsonify(code=RET.PARAMERR, msg="所属区县、载体名称、详细地址不能为空！")
# district_name = get_district(district_name)
# lng = ''
# lat = ''
lng, lat, code, msg = get_jwd(detail_address) lng, lat, code, msg = get_jwd(detail_address)
if code == 1: if code == 1:
return jsonify(code=RET.DATAERR, msg=msg) return jsonify(code=RET.DATAERR, msg=msg)
build_name = req_dic['build_name']
district_name = req_dic['district_name']
development_area = req_dic['development_area']
build_type = req_dic['build_type']
level = req_dic['level']
detail_address = req_dic['detail_address']
construction_time = req_dic['construction_time']
cover_land_area = req_dic['cover_land_area'] cover_land_area = req_dic['cover_land_area']
# cover_land_area_id = '' build_area = req_dic['build_area']
# if cover_land_area: single_area = req_dic['single_area']
# cover_land_area_id = get_cover_land_area_id(cover_land_area) empty_area = req_dic['empty_area']
layer_num = req_dic['layer_num'] layer_num = req_dic['layer_num']
car_space_num = req_dic['car_space_num'] car_space_num = req_dic['car_space_num']
lift_num = req_dic['lift_num'] lift_num = req_dic['lift_num']
build_area = req_dic['build_area'] is_water = req_dic['is_water']
# total_area_id = '' is_electric = req_dic['is_electric']
# if build_area: is_warm = req_dic['is_warm']
# total_area_id = get_total_area_id(build_area) is_gas = req_dic['is_gas']
empty_area = req_dic['empty_area'] is_internet = req_dic['is_internet']
build_type = req_dic['build_type'] is_divide = req_dic['is_divide']
# build_type_id = ''
# if build_type:
# build_type_id = get_build_type_id(build_type)
# build_structure = req_dic['build_structure']
# owner = req_dic['owner']
linkman = req_dic['linkman']
link_mobile = req_dic['link_mobile']
# if link_mobile:
# if not re.match(r"1[23456789]\d{9}$", link_mobile):
# return jsonify(code=RET.PARAMERR, msg="手机号格式错误")
attract_status = req_dic['attract_status'] attract_status = req_dic['attract_status']
cooperation_model = req_dic['cooperation_model']
rent_money = req_dic['rent_money'] rent_money = req_dic['rent_money']
wuye_money = req_dic['wuye_money'] wuye_money = req_dic['wuye_money']
cooperation_model = req_dic['cooperation_model'] linkman = req_dic['linkman']
link_mobile = req_dic['link_mobile']
attract_advantage = req_dic['attract_advantage']
policy = req_dic['policy']
try: try:
carrier_build = CarrierBuild.query.filter_by(id=build_id).first() carrier_build = CarrierBuild.query.filter_by(id=build_id).first()
carrier_build.construction_time = construction_time
carrier_build.district_name = district_name
carrier_build.build_name = build_name carrier_build.build_name = build_name
carrier_build.district_name = district_name
carrier_build.development_area = development_area
carrier_build.build_type = build_type
carrier_build.level = level
carrier_build.detail_address = detail_address carrier_build.detail_address = detail_address
carrier_build.construction_time = construction_time
carrier_build.cover_land_area = cover_land_area carrier_build.cover_land_area = cover_land_area
carrier_build.build_area = build_area
carrier_build.single_area = single_area
carrier_build.empty_area = empty_area
carrier_build.layer_num = layer_num carrier_build.layer_num = layer_num
carrier_build.car_space_num = car_space_num carrier_build.car_space_num = car_space_num
carrier_build.lift_num = lift_num carrier_build.lift_num = lift_num
carrier_build.build_area = build_area carrier_build.is_water = is_water
carrier_build.empty_area = empty_area carrier_build.is_electric = is_electric
carrier_build.build_type = build_type carrier_build.is_warm = is_warm
# carrier_build.build_structure = build_structure carrier_build.is_gas = is_gas
# carrier_build.owner = owner carrier_build.is_internet = is_internet
carrier_build.linkman = linkman carrier_build.is_divide = is_divide
carrier_build.link_mobile = link_mobile
carrier_build.attract_status = attract_status carrier_build.attract_status = attract_status
carrier_build.rent_money = rent_money
carrier_build.cooperation_model = cooperation_model carrier_build.cooperation_model = cooperation_model
carrier_build.rent_money = rent_money
carrier_build.wuye_money = wuye_money
carrier_build.linkman = linkman
carrier_build.link_mobile = link_mobile
carrier_build.fix_time = datetime.now() carrier_build.fix_time = datetime.now()
carrier_build.fix_people = user_name carrier_build.fix_people = user_name
carrier_build.lng = lng carrier_build.lng = lng
carrier_build.lat = lat carrier_build.lat = lat
carrier_build.wuye_money = wuye_money
carrier_build.attract_advantage = attract_advantage
carrier_build.policy = policy
db.session.add(carrier_build) db.session.add(carrier_build)
db.session.commit() db.session.commit()
# 更新es
# build_id_list = [build_id]
# result = fix_build_data(build_id_list, construction_time, district_name, build_name, detail_address,
# cover_land_area, layer_num, car_space_num, lift_num, build_area, empty_area,
# build_type, build_structure, owner, linkman, link_mobile, attract_status,
# rent_money, cooperation_model, lng, lat, build_type_id, build_area,
# total_area_id, cover_land_area_id, '', '')
# if result['_shards']['successful'] and int(result['_shards']['successful']) <= 0:
# db.session.rollback()
# return jsonify(code=RET.THIRDERR, msg="编辑修改楼宇数据后es更新错误，请核实！")
# 记录日志 # 记录日志
operation_message = "修改了1条楼宇数据，该楼宇名称为 {}".format(build_name) operation_message = "修改了1条楼宇数据，该楼宇名称为 {}".format(build_name)
edit_time = datetime.now() edit_time = datetime.now()
...@@ -1596,50 +1585,64 @@ def carrier_edit_land(): ...@@ -1596,50 +1585,64 @@ def carrier_edit_land():
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))
# if role_id == 3: # 如果是办事员可以编辑自己提报的内容
# pass
# if role_id == 2: # 市直部门这区县领导可以编辑该部门所有办事员提报的内容
# pass
# if role_id == 1: # 局领导能看到所有审核通过的内容
# return jsonify(code=RET.THIRDERR, msg="局领导不能编辑数据。")
land_id = req_dic['land_id'] land_id = req_dic['land_id']
district_name = req_dic['district_name'] district_name = req_dic['district_name']
land_name = req_dic['land_name'] land_name = req_dic['land_name']
detail_address = req_dic['detail_address'] detail_address = req_dic['detail_address']
if not all([district_name, land_name, detail_address]): if not all([district_name, land_name, detail_address]):
return jsonify(code=RET.PARAMERR, msg="所属区县、载体名称、详细地址不能为空！") return jsonify(code=RET.PARAMERR, msg="所属区县、载体名称、详细地址不能为空！")
# district_name = get_district(district_name)
lng, lat, code, msg = get_jwd(detail_address) lng, lat, code, msg = get_jwd(detail_address)
if code == 1: if code == 1:
return jsonify(code=RET.DATAERR, msg=msg) return jsonify(code=RET.DATAERR, msg=msg)
land_code = req_dic['land_code'] land_code = req_dic['land_code']
development_area = req_dic['development_area']
land_use = req_dic['land_use']
land_nature = req_dic['land_nature'] land_nature = req_dic['land_nature']
total_area = req_dic['total_area'] total_area = req_dic['total_area']
surface_area = req_dic['surface_area']
plot_ratio = req_dic['plot_ratio']
greening_rate = req_dic['greening_rate']
density = req_dic['density']
height_permitted = req_dic['height_permitted']
transfer_year = req_dic['transfer_year']
develop_degree = req_dic['develop_degree']
investment_intensity = req_dic['investment_intensity']
output_intensity = req_dic['output_intensity']
tax = req_dic['tax']
linkman = req_dic['linkman']
telephone = req_dic['telephone']
other_requirements = req_dic['other_requirements']
try: try:
carrier_land = CarrierLand.query.filter_by(id=land_id).first() carrier_land = CarrierLand.query.filter_by(id=land_id).first()
carrier_land.district_name = district_name
carrier_land.land_name = land_name carrier_land.land_name = land_name
carrier_land.detail_address = detail_address
carrier_land.land_code = land_code carrier_land.land_code = land_code
carrier_land.district_name = district_name
carrier_land.development_area = development_area
carrier_land.detail_address = detail_address
carrier_land.land_use = land_use
carrier_land.land_nature = land_nature carrier_land.land_nature = land_nature
carrier_land.total_area = total_area carrier_land.total_area = total_area
carrier_land.surface_area = surface_area
carrier_land.plot_ratio = plot_ratio
carrier_land.greening_rate = greening_rate
carrier_land.density = density
carrier_land.height_permitted = height_permitted
carrier_land.transfer_year = transfer_year
carrier_land.develop_degree = develop_degree
carrier_land.investment_intensity = investment_intensity
carrier_land.output_intensity = output_intensity
carrier_land.tax = tax
carrier_land.linkman = linkman
carrier_land.telephone = telephone
carrier_land.other_requirements = other_requirements
carrier_land.fix_time = datetime.now() carrier_land.fix_time = datetime.now()
carrier_land.fix_people = user_name carrier_land.fix_people = user_name
carrier_land.lng = lng carrier_land.lng = lng
carrier_land.lat = lat carrier_land.lat = lat
# db.session.add(carrier_land)
db.session.commit() db.session.commit()
# 更新es
# audit_id_list = [land_id]
# result = fix_land_data(audit_id_list, district_name, land_name, detail_address, lng, lat, total_area,
# total_area_id, jing_area, land_nature, land_nature_id, transfer_year,
# transfer_year_id, industry_type, land_code, land_status, '', '')
# if result['_shards']['successful'] and int(result['_shards']['successful']) <= 0:
# db.session.rollback()
# return jsonify(code=RET.THIRDERR, msg="编辑修改土地数据后es更新错误，请核实！")
# 记录日志 # 记录日志
operation_message = "修改了1条土地数据，该土地名称为 {}".format(land_name) operation_message = "修改了1条土地数据，该土地名称为 {}".format(land_name)
edit_time = datetime.now() edit_time = datetime.now()
...@@ -1657,40 +1660,38 @@ def carrier_edit_land(): ...@@ -1657,40 +1660,38 @@ def carrier_edit_land():
return jsonify(code=RET.OK, msg="查询数据库错误！") return jsonify(code=RET.OK, msg="查询数据库错误！")
@api_address.route("/CarrierLandStatus", methods=["POST"]) # @api_address.route("/CarrierLandStatus", methods=["POST"])
def land_status(): # def land_status():
# 获取编辑后的数据 # # 获取编辑后的数据
req_dic = request.get_json() # req_dic = request.get_json()
# 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)) # land_id = req_dic['land_id']
land_id = req_dic['land_id'] # land_status = req_dic['land_status']
land_status = req_dic['land_status'] # try:
try: # carrier_build = CarrierLand.query.filter_by(id=land_id).first()
carrier_build = CarrierLand.query.filter_by(id=land_id).first() # land_name = carrier_build.land_name
land_name = carrier_build.land_name # carrier_build.land_status = land_status
carrier_build.land_status = land_status # db.session.add(carrier_build)
db.session.add(carrier_build) # db.session.commit()
db.session.commit() # # 记录日志
# TODO 更新es # operation_message = "修改了1条土地状态，该土地名称为 {}".format(land_name)
# 记录日志 # edit_time = datetime.now()
operation_message = "修改了1条土地状态，该土地名称为 {}".format(land_name) # log = OperationLog(read_type=0, operation_people_id=user_id, operation_people_belong=belong_unit, operation_time=edit_time,
edit_time = datetime.now() # operation_people=user_name, operation_message=operation_message,
log = OperationLog(read_type=0, operation_people_id=user_id, operation_people_belong=belong_unit, operation_time=edit_time, # operation_mobile=operation_mobile, section=section)
operation_people=user_name, operation_message=operation_message, # db.session.add(log)
operation_mobile=operation_mobile, section=section) # db.session.commit()
db.session.add(log) # return jsonify(code=RET.OK, msg="数据修改成功！")
db.session.commit() # except Exception as e:
return jsonify(code=RET.OK, msg="数据修改成功！") # db.session.rollback()
except Exception as e: # current_app.logger.error(e)
db.session.rollback() # return jsonify(code=RET.OK, msg="查询数据库错误！")
current_app.logger.error(e)
return jsonify(code=RET.OK, msg="查询数据库错误！")
# 编辑修改厂房 # 编辑修改厂房
...@@ -1698,7 +1699,6 @@ def land_status(): ...@@ -1698,7 +1699,6 @@ def land_status():
def carrier_edit_factory(): def carrier_edit_factory():
# 获取编辑后的数据 # 获取编辑后的数据
req_dic = request.get_json() req_dic = request.get_json()
# token = req_dic['token']
token = request.headers['token'] token = request.headers['token']
action_name = '编辑修改楼宇数据' action_name = '编辑修改楼宇数据'
try: try:
...@@ -1706,53 +1706,42 @@ def carrier_edit_factory(): ...@@ -1706,53 +1706,42 @@ def carrier_edit_factory():
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))
# if role_id == 3: # 如果是办事员可以编辑自己提报的内容
# pass
# if role_id == 2: # 市直部门这区县领导可以编辑该部门所有办事员提报的内容
# pass
# if role_id == 1: # 局领导能看到所有审核通过的内容
# return jsonify(code=RET.THIRDERR, msg="局领导不能编辑数据。")
factory_id = req_dic['factory_id'] factory_id = req_dic['factory_id']
district_name = req_dic['district_name'] district_name = req_dic['district_name']
factory_name = req_dic['factory_name'] factory_name = req_dic['factory_name']
detail_address = req_dic['detail_address'] detail_address = req_dic['detail_address']
if not all([district_name, factory_name, detail_address]): if not all([district_name, factory_name, detail_address]):
return jsonify(code=RET.PARAMERR, msg="所属区县、载体名称、详细地址不能为空！") return jsonify(code=RET.PARAMERR, msg="所属区县、载体名称、详细地址不能为空！")
# district_name = get_district(district_name)
is_standard = req_dic['is_standard']
rent_money = req_dic['rent_money']
construction_time = req_dic['construction_time']
detail_address = req_dic['detail_address']
lng, lat, code, msg = get_jwd(detail_address) lng, lat, code, msg = get_jwd(detail_address)
if code == 1: if code == 1:
return jsonify(code=RET.DATAERR, msg=msg) return jsonify(code=RET.DATAERR, msg=msg)
# owner = req_dic['owner'] factory_name = req_dic['factory_name']
district_name = req_dic['district_name']
development_area = req_dic['development_area']
build_type = req_dic['build_type']
is_standard = req_dic['is_standard']
construction_time = req_dic['construction_time']
cover_land_area = req_dic['cover_land_area'] cover_land_area = req_dic['cover_land_area']
# cover_land_area_id = ''
# if cover_land_area:
# cover_land_area_id = get_cover_land_area_id(cover_land_area)
factory_area = req_dic['factory_area'] factory_area = req_dic['factory_area']
empty_area = req_dic['empty_area'] empty_area = req_dic['empty_area']
layer_num = req_dic['layer_num']
factory_structure = req_dic['factory_structure'] factory_structure = req_dic['factory_structure']
width = req_dic['width'] width = req_dic['width']
high = req_dic['high'] high = req_dic['high']
bearing = req_dic['bearing'] bearing = req_dic['bearing']
linkman = req_dic['linkman']
is_electric = req_dic['is_electric']
is_water = req_dic['is_water'] is_water = req_dic['is_water']
is_electric = req_dic['is_electric']
is_warm = req_dic['is_warm'] is_warm = req_dic['is_warm']
is_gas = req_dic['is_gas'] is_gas = req_dic['is_gas']
is_network = req_dic['is_network'] is_network = req_dic['is_network']
is_car = req_dic['is_car']
lift_num = req_dic['lift_num'] lift_num = req_dic['lift_num']
# is_lift = ''
# if lift_num and int(lift_num) > 0:
# is_lift = 1
layer_num = req_dic['layer_num']
attract_status = req_dic['attract_status'] attract_status = req_dic['attract_status']
settled_enterprise = req_dic['settled_enterprise']
cooperation_model = req_dic['cooperation_model'] cooperation_model = req_dic['cooperation_model']
attract_advantage = req_dic['attract_advantage'] rent_money = req_dic['rent_money']
policy = req_dic['policy'] linkman = req_dic['linkman']
link_mobile = req_dic['link_mobile'] link_mobile = req_dic['link_mobile']
if is_electric not in ['', '是', '否'] or \ if is_electric not in ['', '是', '否'] or \
is_water not in ['', '是', '否'] or \ is_water not in ['', '是', '否'] or \
...@@ -1762,58 +1751,45 @@ def carrier_edit_factory(): ...@@ -1762,58 +1751,45 @@ def carrier_edit_factory():
is_network not in ['', '是', '否']: is_network not in ['', '是', '否']:
return jsonify(code=RET.DATAERR, msg='上传失败！电气热暖/标准厂房相关字段格式不正确，请按备注填写是或否或置空！') return jsonify(code=RET.DATAERR, msg='上传失败！电气热暖/标准厂房相关字段格式不正确，请按备注填写是或否或置空！')
# if link_mobile:
# if not re.match(r"1[23456789]\d{9}$", link_mobile):
# return jsonify(code=RET.PARAMERR, msg="手机号格式错误")
try: try:
carrier_factory = CarrierFactory.query.filter_by(id=factory_id).first() carrier_factory = CarrierFactory.query.filter_by(id=factory_id).first()
carrier_factory.district_name = district_name
carrier_factory.factory_name = factory_name carrier_factory.factory_name = factory_name
carrier_factory.district_name = district_name
carrier_factory.development_area = development_area
carrier_factory.build_type = build_type
carrier_factory.is_standard = is_standard carrier_factory.is_standard = is_standard
carrier_factory.rent_money = rent_money
carrier_factory.construction_time = construction_time
carrier_factory.detail_address = detail_address carrier_factory.detail_address = detail_address
# carrier_factory.owner = owner carrier_factory.construction_time = construction_time
carrier_factory.cover_land_area = cover_land_area carrier_factory.cover_land_area = cover_land_area
carrier_factory.factory_area = factory_area carrier_factory.factory_area = factory_area
carrier_factory.empty_area = empty_area carrier_factory.empty_area = empty_area
carrier_factory.layer_num = layer_num
carrier_factory.factory_structure = factory_structure carrier_factory.factory_structure = factory_structure
carrier_factory.width = width carrier_factory.width = width
carrier_factory.high = high carrier_factory.high = high
carrier_factory.bearing = bearing carrier_factory.bearing = bearing
carrier_factory.linkman = linkman
carrier_factory.link_mobile = link_mobile
carrier_factory.is_electric = is_electric
carrier_factory.is_water = is_water carrier_factory.is_water = is_water
carrier_factory.is_electric = is_electric
carrier_factory.is_warm = is_warm carrier_factory.is_warm = is_warm
carrier_factory.is_gas = is_gas carrier_factory.is_gas = is_gas
carrier_factory.is_network = is_network carrier_factory.is_network = is_network
carrier_factory.is_car = is_car
carrier_factory.lift_num = lift_num carrier_factory.lift_num = lift_num
carrier_factory.layer_num = layer_num carrier_factory.attract_status = attract_status
carrier_factory.settled_enterprise = settled_enterprise
carrier_factory.cooperation_model = cooperation_model
carrier_factory.rent_money = rent_money
carrier_factory.linkman = linkman
carrier_factory.link_mobile = link_mobile
carrier_factory.fix_time = datetime.now() carrier_factory.fix_time = datetime.now()
carrier_factory.fix_people = user_name carrier_factory.fix_people = user_name
carrier_factory.lng = lng carrier_factory.lng = lng
carrier_factory.lat = lat carrier_factory.lat = lat
carrier_factory.attract_status = attract_status
carrier_factory.cooperation_model = cooperation_model
carrier_factory.attract_advantage = attract_advantage
carrier_factory.policy = policy
db.session.add(carrier_factory) db.session.add(carrier_factory)
db.session.commit() db.session.commit()
# 更新es
# factory_id_list = [factory_id]
# result = fix_factory_data(factory_id_list, district_name, factory_name, detail_address, lng, lat,
# factory_structure, factory_area, cover_land_area, cover_land_area_id,
# is_lift, is_standard, owner, rent_money, construction_time, empty_area,
# width, high, bearing, linkman, link_mobile, is_electric, is_water, is_warm,
# is_gas, is_network, lift_num, layer_num, '', '')
# if result['_shards']['successful'] and int(result['_shards']['successful']) <= 0:
# db.session.rollback()
# return jsonify(code=RET.THIRDERR, msg="编辑修改厂房数据后es更新错误，请核实！")
# 记录日志 # 记录日志
operation_message = "修改了1条厂房数据，该厂房名称为 {}".format(factory_name) operation_message = "修改了1条厂房数据，该厂房名称为 {}".format(factory_name)
edit_time = datetime.now() edit_time = datetime.now()
...@@ -1858,154 +1834,33 @@ def search_carrier_build(): ...@@ -1858,154 +1834,33 @@ def search_carrier_build():
try: try:
if all([build_name, district_name, build_type]): if all([build_name, district_name, build_type]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.district_name == district_name,
# CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.district_name == district_name,
# CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.district_name == district_name,
# 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.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]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.district_name == district_name,
# CarrierBuild.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.district_name == district_name,
# CarrierBuild.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.district_name == district_name,
# CarrierBuild.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
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]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# 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.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]):
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
# CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.upload_people_id == user_id)
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
# CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.upload_people_belong == belong_unit)
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
# 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 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:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.upload_people_id == user_id))
#
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.upload_people_belong == belong_unit))
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
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:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
# CarrierBuild.upload_people_id == user_id))
#
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
# CarrierBuild.upload_people_belong == belong_unit))
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
# CarrierBuild.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
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:
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.upload_people_id == user_id))
#
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.upload_people_belong == belong_unit))
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
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: # 无参数，搜索全部
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierBuild.query.filter(CarrierBuild.upload_people_id == user_id)
#
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierBuild.query.filter(CarrierBuild.upload_people_belong == belong_unit)
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierBuild.query.filter(CarrierBuild.audit_status.in_([1, 3]))
#
# carrier_size = carrier_obj.count()
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()
......
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