Skip to content

M
mancheng
Commit aa8a14d9 by dong
Options

fix20221228

parent 8451ba01
Showing with 55 additions and 64 deletions
apps/__init__.py
......@@ -96,7 +96,7 @@ def creat_app(config_name):
from apps.view_map import api_map
from apps.view_360company import api_portraits
from apps.view_choose import api_address
# from apps.manage import api_power
from apps.manage import api_power
from apps.inves_manage import api_manage
# from apps.view_mobile import api_mobile
......@@ -108,7 +108,7 @@ def creat_app(config_name):
app.register_blueprint(api_attract, url_prefix='/api/attract/industry') # 招商驾驶舱
app.register_blueprint(api_portraits, url_prefix="/api/360company") # 360企业画像
app.register_blueprint(api_address, url_prefix="/api/address") # 选址评估
# app.register_blueprint(api_power, url_prefix="/api/power")
app.register_blueprint(api_power, url_prefix="/api/power")
app.register_blueprint(api_manage, url_prefix="/api/manage")
# app.register_blueprint(api_mobile, url_prefix="/api/mobile")
......
apps/inves_manage/project_manager.py
......@@ -1635,7 +1635,8 @@ def add_edit_money_arrive():
for data in data_list:
data_time = data['data_time'] # 数据年份
district_name = data['district_name'] # 区县名称
money_arrive = float(data['money_arrive']) # 签约金额
# money_arrive = float(data['money_arrive']) # 签约金额
money_arrive = data['money_arrive'] # 签约金额
try:
target_obj = MoneyArrive.query.filter_by(district_name=district_name, data_time=data_time, is_delete=0).first()
if target_obj: # 更新
......
apps/manage/view_user.py
......@@ -14,26 +14,20 @@ def user_list_external():
req_dict = request.get_json()
page = req_dict.get("page")
perpage = req_dict.get("perpage")
key = req_dict.get("key") # 查询条件
# key = req_dict.get("key") # 查询条件
# 校验参数完整性
if not all([page, perpage]):
return jsonify(code=RET.PARAMERR, msg="参数不完整")
try:
user = User.query.filter_by(flag=1)
if key:
user = user.filter(User.name.like("%{}%".format(key)))
result = user.paginate(page, perpage).items
size = user.count()
df = [{"id": i.id,
"real_name": i.real_name if i.real_name else "-",
"name": i.name if i.name else "-",
"mobile": i.mobile if i.mobile else "-",
"age": i.age if i.age else "-",
"sex": "男" if i.sex == 1 else "女" if i.sex == 2 else "-",
"create_time": str(i.create_time) if i.create_time else "-",
"email": i.email if i.email else "-",
"status": i.status} for i in result] # 1启用,2禁止
} for i in result]
data = {"df": df, "size": size}
return jsonify(code=RET.OK, msg="查询成功", data=data)
except Exception as e:
......@@ -47,7 +41,7 @@ def user_list_external():
def update_status():
req_dict = request.get_json()
_id = req_dict.get("id")
status = req_dict.get("status") # 1通过 2禁用
status = req_dict.get("status") # 0禁止，1在用
# 校验参数完整性
if not all([_id]):
......@@ -55,9 +49,9 @@ def update_status():
try:
user = User.query.get(_id)
if status == 1:
user.status = 3
else:
user.status = 1
else:
user.status = 0
db.session.commit()
return jsonify(code=RET.OK, msg="修改成功")
except Exception as e:
......@@ -132,18 +126,15 @@ def user_list_inside():
result = user.paginate(page, perpage).items
df = [{"id": i.id,
"real_name": i.real_name if i.real_name else "-",
"position": i.position if i.position else "-",
"level": i.level if i.level else "-",
"unit": i.unit if i.unit else "-",
"section": i.section if i.section else "-",
"leader": i.leader if i.leader else "-",
"mobile": i.mobile if i.mobile else "-",
"age": i.age if i.age else "-",
"sex": "男" if i.sex == 1 else "女" if i.sex == 2 else "-",
"email": i.email if i.email else "-",
"name": i.name if i.name else "-",
"create_time": str(i.create_time) if i.create_time else "-",
"status": "通过" if i.status == 1 else "在审" if i.status == 2 else "驳回"} for i in result]
"status": "通过" if i.status == 1 else "在审" if i.status == 2 else "驳回",
"position": i.position if i.position else "-",
"unit": i.belong_organization if i.belong_organization else "-",
"section": i.belong_department if i.belong_department else "-",
"role": "部门负责人" if i.role_id == 1 else
"局领导" if i.role_id == 2 else
"办事员工" if i.role_id == 3 else "-",
} for i in result]
data = {"df": df, "size": size}
return jsonify(code=RET.OK, msg="查询成功", data=data)
except Exception as e:
......@@ -164,17 +155,13 @@ def user_inside_info():
data = {"id": i.id,
"real_name": i.real_name if i.real_name else "-",
"position": i.position if i.position else "-",
"level": "", # 角色
"unit": "", # 机构
"section": "", # 部门
"leader": i.leader if i.leader else "-",
"mobile": i.mobile if i.mobile else "-",
"age": i.age if i.age else "-",
"sex": "男" if i.sex == 1 else "女" if i.sex == 2 else "-",
"email": i.email if i.email else "",
"name": i.name if i.name else "-",
"create_time": str(i.create_time) if i.create_time else "-",
"status": "通过" if i.status == 1 else "在审" if i.status == 2 else "驳回"}
"role": "部门负责人" if i.role_id == 1 else
"局领导" if i.role_id == 2 else
"办事员工" if i.role_id == 3 else "-", # 角色
"unit": i.belong_organization, # 机构
"section": i.belong_department, # 部门
"mobile": i.mobile if i.mobile else "-"
}
return jsonify(code=RET.OK, msg="查询成功", data=data)
except Exception as e:
......@@ -190,35 +177,32 @@ def update_user():
_id = req_dict.get("id") # 当亲用户id
real_name = req_dict.get("real_name") # 真名
position = req_dict.get("position") # 职务
level = req_dict.get("level") # 角色id 必选
unit = req_dict.get("unit") # 机构
section = req_dict.get("section") # 部门
leader = req_dict.get("leader") # 领导
role_id = req_dict.get("role_id") # 角色id 必选
mobile = req_dict.get("mobile")
sex = req_dict.get("sex") # 1男2女
age = req_dict.get("age")
email = req_dict.get("email")
name = req_dict.get("name")
password = req_dict.get("name")
leader = req_dict.get("leader") # 领导
password = req_dict.get("password")
password1 = req_dict.get("password1")
# 用户名唯一(字母开头，长度4-15)
try:
patten = "^[a-zA-Z][\w]*[\w]*$"
if re.match(patten, name) and re.match(patten, name).string == name:
user = User.query.filter_by(name=name).filter(User.id != _id).first()
if user:
return jsonify(code=RET.DATAEXIST, msg="用户名已存在")
else:
return jsonify(code=RET.DATAERR, msg="用户名格式错误")
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="用户名格式错误")
# try:
# patten = "^[a-zA-Z][\w]*[\w]*$"
# if re.match(patten, name) and re.match(patten, name).string == name:
# user = User.query.filter_by(name=name).filter(User.id != _id).first()
# if user:
# return jsonify(code=RET.DATAEXIST, msg="用户名已存在")
# else:
# return jsonify(code=RET.DATAERR, msg="用户名格式错误")
# except Exception as e:
# current_app.logger.error(e)
# return jsonify(code=RET.DBERR, msg="用户名格式错误")
# 校验参数完整性
if not all([_id, real_name, position, level, leader, mobile, sex, age, name]):
if not all([_id, real_name, position, role_id, leader, mobile]):
return jsonify(code=RET.PARAMERR, msg="请选择必填项")
try:
role = Role.query.get(level)
role = Role.query.get(role_id)
user = User.query.get(_id)
user.real_name = real_name
......@@ -230,13 +214,19 @@ def update_user():
user.section = Section.query.get(section).name
user.leader = leader
user.mobile = mobile
user.sex = sex
user.age = age
if email:
user.email = email
user.name = name
if password:
user.password = password
# user.sex = sex
# user.age = age
# if email:
# user.email = email
user.name = real_name
if password and not password1:
return jsonify(code=RET.PARAMERR, msg="请填写确认密码！")
if password1 and not password:
return jsonify(code=RET.PARAMERR, msg="请填写密码！")
if password and password1:
if password != password1:
return jsonify(code=RET.PARAMERR, msg="密码和确认密码不一致！")
user.password = password
role.users.append(user)
db.session.commit()
......
apps/models.py
......@@ -918,7 +918,7 @@ class User(BaseModel, db.Model):
# 个人中心的信息
function = db.Column(db.Text, comment='工作职能 ---个人中心')
flag = db.Column(db.Integer, comment='普通1，政府2')
status = db.Column(db.Integer, comment='0禁止，1在用')
status = db.Column(db.Integer, comment='0禁止，1通过，2再审，3驳回')
# status = db.Column(db.Integer, comment='通过1，在审2,驳回3')
# bused = db.Column(db.Integer) # 账户有无组织
# 政府信息
......
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