fix20230417

apps/big_data/view.py

@@ -278,15 +278,19 @@ def get_project():
 def major_project():
     req_dict = request.get_json()
     district = req_dict.get("district")  # 县区
+    year = req_dict['year']
 
     try:
         if not district or district == "晋城市":
-            project = Project.query.all()
+            project = Project.query.filter(Project.year == year if year else text('')).all()
             data_project = [{"name": i.name, "id": i.id} for i in project]
             return jsonify(code=RET.OK, msg="查询成功", data=data_project)
 
         else:  # 区县、开发区
-            project = Project.query.filter_by(district=district)
+            project = Project.query.filter(
+                Project.district == district,
+                Project.year == year if year else text('')
+            ).all()
             data_project = [{"name": i.name, "id": i.id} for i in project]
             return jsonify(code=RET.OK, msg="查询成功", data=data_project)
     except Exception as e:

apps/models.py

@@ -615,6 +615,7 @@ class Project(BaseModel, db.Model):
     __table_args__ = ({'comment': '招商驾驶舱-重点招商项目表'})  # 添加表注释
 
     id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='工程id')  # 工程id
+    year = db.Column(db.Integer, comment='年')  # 年
     project_stage_id = db.Column(db.Integer, comment='项目阶段id：落地项目为1，招商项目为2')
     name = db.Column(db.String(255), comment='工程名')  # 一.工程名
     district = db.Column(db.String(255), comment='区县名称')  # 二.县区