Skip to content

M
mancheng
Commit 8451ba01 by dong
Options

fix20221227

parent 0d47e3e4
Showing with 79 additions and 13 deletions
apps/inves_manage/statistic_analysis_view.py
......@@ -43,7 +43,8 @@ def get_data1(district_li, current_year):
# 年度目标
jc_obj = JcTarget.query.filter(
JcTarget.district_name == district if district != '全市' else text(''),
JcTarget.year.like('%{}%'.format(str(current_year)))
JcTarget.year.like('%{}%'.format(str(current_year))),
JcTarget.is_delete == 0
).first()
if not jc_obj:
year_target = 0
......@@ -117,7 +118,8 @@ def get_data3(district_li, current_year):
# 年度目标
jc_obj = JcTarget.query.filter(
JcTarget.district_name == district if district != '全市' else text(''),
JcTarget.year.like('%{}%'.format(str(current_year)))
JcTarget.year.like('%{}%'.format(str(current_year))),
JcTarget.is_delete == 0
).first()
if not jc_obj:
year_target = 0
......@@ -156,7 +158,8 @@ def get_data4(district_li, current_year):
# 年度目标
jc_obj = JcTarget.query.filter(
JcTarget.district_name == district if district != '全市' else text(''),
JcTarget.year.like('%{}%'.format(str(current_year)))
JcTarget.year.like('%{}%'.format(str(current_year))),
JcTarget.is_delete == 0
).first()
if not jc_obj:
year_target = 0
......@@ -197,7 +200,8 @@ def get_data5(district_li, current_year):
# 年度目标
jc_obj = JcTarget.query.filter(
JcTarget.district_name == district if district != '全市' else text(''),
JcTarget.year.like('%{}%'.format(str(current_year)))
JcTarget.year.like('%{}%'.format(str(current_year))),
JcTarget.is_delete == 0
).first()
if not jc_obj:
year_target = 0
......@@ -466,6 +470,7 @@ def export_jc_data1(data_time, path, pro_path):
# 签约年度目标（亿元）
jc_obj = JcTarget.query.filter(JcTarget.year.like('%{}%'.format(str(current_year))),
JcTarget.is_delete == 0,
JcTarget.district_name.like('%{}%'.format(str(district))) if district != '全市' else text('')).first()
sign_target = 0
if jc_obj:
......@@ -520,7 +525,8 @@ def export_jc_data1(data_time, path, pro_path):
# 新开工年度目标
jc_obj = JcTarget.query.filter(
JcTarget.district_name == district if district != '全市' else text(''),
JcTarget.year.like('%{}%'.format(str(current_year)))
JcTarget.year.like('%{}%'.format(str(current_year))),
JcTarget.is_delete == 0
).first()
if not jc_obj:
new_start_target = 0
......@@ -556,7 +562,8 @@ def export_jc_data1(data_time, path, pro_path):
# 年度目标
jc_obj = JcTarget.query.filter(
JcTarget.district_name == district if district != '全市' else text(''),
JcTarget.year.like('%{}%'.format(str(current_year)))
JcTarget.year.like('%{}%'.format(str(current_year))),
JcTarget.is_delete == 0
).first()
if not jc_obj:
gutou1_target = 0
......@@ -592,7 +599,8 @@ def export_jc_data1(data_time, path, pro_path):
# 年度目标
jc_obj = JcTarget.query.filter(
JcTarget.district_name == district,
JcTarget.year.like('%{}%'.format(str(current_year)))
JcTarget.year.like('%{}%'.format(str(current_year))),
JcTarget.is_delete == 0
).first()
if not jc_obj:
gutou0_target = 0
......@@ -695,7 +703,9 @@ def export_jc_data2(data_time, path, pro_path):
sign_money = sum([project_obj.investment_volume / 10000 for project_obj in project_obj_list if project_obj_list])
data_list.append(sign_money)
# 4属地签约任务（亿元）
target_obj = JcTarget.query.filter(JcTarget.district_name == district, JcTarget.year == current_year + '年').first()
target_obj = JcTarget.query.filter(JcTarget.district_name == district,
JcTarget.is_delete == 0,
JcTarget.year == current_year + '年').first()
if target_obj:
target_money = target_obj.money_sign
else:
......@@ -1191,8 +1201,8 @@ def get_data():
data.update({"district": district})
# 年度目标
jc_obj = JcTarget.query.filter(JcTarget.year.like('%{}%'.format(current_year)),
JcTarget.district_name.like(
'%{}%'.format(str(district))) if district != '全市' else text('')).first()
JcTarget.is_delete == 0,
JcTarget.district_name.like('%{}%'.format(str(district))) if district != '全市' else text('')).first()
target = 0
if jc_obj:
target = jc_obj.money_sign
......@@ -1266,7 +1276,8 @@ def get_data():
# 新开工年度目标
jc_obj = JcTarget.query.filter(
JcTarget.district_name == district if district != '全市' else text(''),
JcTarget.year.like('%{}%'.format(current_year))
JcTarget.year.like('%{}%'.format(current_year)),
JcTarget.is_delete == 0
).first()
if not jc_obj:
target = 0
......@@ -1308,7 +1319,8 @@ def get_data():
# 年度目标
jc_obj = JcTarget.query.filter(
JcTarget.district_name == district if district != '全市' else text(''),
JcTarget.year.like('%{}%'.format(str(current_year)))
JcTarget.year.like('%{}%'.format(str(current_year))),
JcTarget.is_delete == 0
).first()
if not jc_obj:
gutou1_target = 0
......@@ -1347,7 +1359,8 @@ def get_data():
# 年度目标
jc_obj = JcTarget.query.filter(
JcTarget.district_name == district,
JcTarget.year.like('%{}%'.format(current_year))
JcTarget.year.like('%{}%'.format(current_year)),
JcTarget.is_delete == 0
).first()
if not jc_obj:
gutou0_target = 0
......
apps/models.py
......@@ -1058,6 +1058,59 @@ class GovDepartment(db.Model):
goverment = db.relationship('GovOrganization', backref=db.backref('government_departments')) # 政府1-N部门
# 政府机构之间的上下级统筹
followers = db.Table('followers',
db.Column('follower_id', db.Integer, db.ForeignKey('government.id'), primary_key=True),
db.Column('followed_id', db.Integer, db.ForeignKey('government.id'), primary_key=True)
)
# 政府机构表（自关联多对多）
class Government(db.Model):
__tablename__ = "government"
# 基本信息
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
pnums = db.Column(db.Integer) # 人数
charge = db.Column(db.String(255)) # 机构负责人
charge_phone = db.Column(db.String(255)) # 负责人电话
function = db.Column(db.Text) # 部门职能
name = db.Column(db.String(255), nullable=False, index=True) # 政府机构单位名称
# followed 我的下级，管制谁，followers 我的上级，谁管制我
followed = db.relationship('Government', secondary=followers, primaryjoin=(followers.c.follower_id == id),
secondaryjoin=(followers.c.followed_id == id),
backref=db.backref('followers', lazy='dynamic'), lazy='dynamic')
# 政府部门（政府-部门 一对多）
class Section(db.Model):
__tablename__ = "section"
# 基本信息
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
pnums = db.Column(db.Integer) # 人数
charge = db.Column(db.String(255)) # 部门负责人
charge_phone = db.Column(db.String(255)) # 负责人电话
function = db.Column(db.Text) # 部门职能
name = db.Column(db.String(255), nullable=False) # 政府机构部门名称
# gid = db.Column(db.Integer) # 政府id
goverment_id = db.Column(db.Integer, db.ForeignKey("government.id"))
goverment = db.relationship('Government', backref=db.backref('sections')) # 政府1-N部门
# 政府组（政府1-N部门1-N组）
class Group(db.Model):
__tablename__ = "group"
# 基本信息
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
pnums = db.Column(db.Integer) # 人数
charge = db.Column(db.String(255)) # 组负责人
charge_phone = db.Column(db.String(255)) # 负责人电话
function = db.Column(db.Text) # 部门职能
name = db.Column(db.String(255), nullable=False) # 政府机构部门下组的名称
# sid = db.Column(db.Integer) # 部门id
section_id = db.Column(db.Integer, db.ForeignKey("section.id"))
section = db.relationship('Section', backref=db.backref('groups')) # 部门1-N组
"""招商资源管理"""
......
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