fix20221126

apps/models.py

@@ -1235,15 +1235,15 @@ class ShanxiTarget(db.Model):
     district_name = db.Column(db.String(30), comment='区县名称')
     # 签约项目情况
     sign_money = db.Column(db.Float, comment='签约金额')
-    sign_target_money = db.Column(db.Float, comment='目标金额')
+    sign_target_money = db.Column(db.Float, comment='目标金额(年度目标)')
     sign_finish_rate = db.Column(db.Float, comment='完成率')
     # 新开工固定资产投资项目计划投资完成情况
     plan_invest_money = db.Column(db.Float, comment='计划投资额')
-    plan_target_money = db.Column(db.Float, comment='目标计划投资额')
+    plan_target_money = db.Column(db.Float, comment='目标计划投资额(年度目标)')
     plan_finish_rate = db.Column(db.Float, comment='计划投资额完成率')
     # 固定资产投资项目资金到位情况
     arrive_money = db.Column(db.Float, comment='资金到位')
-    arrive_target_money = db.Column(db.Float, comment='目标资金到位')
+    arrive_target_money = db.Column(db.Float, comment='目标资金到位(年度目标)')
     arrive_finish_rate = db.Column(db.Float, comment='计划投资额完成率')
 
 
@@ -1259,21 +1259,33 @@ class JcTarget(db.Model):
     upload_unit = db.Column(db.String(30), comment='上传部门')
     upload_people = db.Column(db.String(30), comment='上传人')
 
-    grade_sign = db.Column(db.Float, comment='签约项目金额')
-    grade_start = db.Column(db.Float, comment='项目开工率')
-    grade_plan_invest = db.Column(db.Float, comment='新开工固定资产投资项目计划投资额')
-    grade_arrive_target1 = db.Column(db.Float, comment='固定资产投资项目资金到位额')
-    grade_arrive_target0 = db.Column(db.Float, comment='非固定资产投资项目资金到位额')
+    grade_sign = db.Column(db.Float, comment='签约项目情况赋分15')
+    grade_start = db.Column(db.Float, comment='项目开工率赋分5')
+    grade_plan_invest = db.Column(db.Float, comment='新开工固定资产投资项目计划投资赋分25')
+    grade_arrive_target1 = db.Column(db.Float, comment='固定资产投资项目资金到位赋分25')
+    grade_arrive_target0 = db.Column(db.Float, comment='非固定资产投资项目资金到位赋分5')
 
     district_name = db.Column(db.String(30), comment='区县名称')
-    money_sign = db.Column(db.Float, comment='签约项目金额')
-    rate_start = db.Column(db.Float, comment='项目开工率')
-    money_plan_invest = db.Column(db.Float, comment='新开工固定资产投资项目计划投资额')
-    money_arrive_target1 = db.Column(db.Float, comment='固定资产投资项目资金到位额')
-    money_arrive_target0 = db.Column(db.Float, comment='非固定资产投资项目资金到位额')
+    money_sign = db.Column(db.Float, comment='签约项目金额(年度目标)')
+    rate_start = db.Column(db.Float, comment='项目开工率(年度目标)')
+    money_plan_invest = db.Column(db.Float, comment='新开工固定资产投资项目计划投资额(年度目标)')
+    money_arrive_target1 = db.Column(db.Float, comment='固定资产投资项目资金到位额(年度目标)')
+    money_arrive_target0 = db.Column(db.Float, comment='非固定资产投资项目资金到位额(年度目标)')
 
 
+# 项目化管理-固定资产投资项目资金到位表
+class MoneyArrive(db.Model):
+    __tablename_ = "money_arrive"
+    __table_args__ = ({'comment': '项目化管理-固定资产投资项目资金到位表'})  # 添加表注释
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
+    is_delete = db.Column(db.Integer, comment='逻辑删除')
+    data_time = db.Column(db.String(30), comment='数据年份')
+    upload_time = db.Column(db.String(30), comment='上传日期')
+    upload_unit = db.Column(db.String(30), comment='上传部门')
+    upload_people = db.Column(db.String(30), comment='上传人')
 
+    district_name = db.Column(db.String(30), comment='区县名称')
+    arrive_money = db.Column(db.Float, comment='固定资产投资项目资金到位额（')