fix20230110

apps/inves_manage/statistic_analysis_view.py

@@ -27,25 +27,15 @@ from apps.inves_manage.siku_view import get_num, upload_daily_picture
 
 
 # 项目签约完成率
-def get_data1(district_li, current_year, data_time):
+def get_data1(district_li, current_year):
     data_li1 = []
-    if data_time:
-        data_time = data_time[0] + '/' + data_time[1] + '/' + data_time[2]
     try:
         for district in district_li:
-            if not data_time:
-                project_obj_list = ProjectManagement.query.filter(
-                    ProjectManagement.is_delete == 0,
-                    ProjectManagement.sign_time.like('%{}%'.format(str(current_year))),
-                    ProjectManagement.district.like('%{}%'.format(str(district))) if district != '全市' else text('')
-                ).all()
-            else:
-                project_obj_list = ProjectManagement.query.filter(
-                    ProjectManagement.is_delete == 0,
-                    ProjectManagement.sign_time.like('%{}%'.format(str(current_year))),
-                    ProjectManagement.district.like('%{}%'.format(str(district))) if district != '全市' else text('')
-                ).all()
-                project_obj_list = [int(project_obj.sign_time.split('/')[1]) < data_time[1] for project_obj in project_obj_list]
+            project_obj_list = ProjectManagement.query.filter(
+                ProjectManagement.is_delete == 0,
+                ProjectManagement.sign_time.like('%{}%'.format(str(current_year))),
+                ProjectManagement.district.like('%{}%'.format(str(district))) if district != '全市' else text('')
+            ).all()
             if not project_obj_list:
                 investment_volume = 0
             else:
@@ -314,9 +304,9 @@ def get_data6(district_li, current_year):
     return data_li6
 
 
-def get_data_li(district_li, current_year, data_time):
+def get_data_li(district_li, current_year):
     # 一。项目签约完成率(签约项目完成率：完成率（%）：签约金额（亿元）/ 年度目标（亿元）)
-    data_li1 = get_data1(district_li, current_year, data_time)
+    data_li1 = get_data1(district_li, current_year)
     if data_li1 == 'error':
         return jsonify(code=RET.DBERR, msg='项目签约完成率计算出错')
 
@@ -348,18 +338,20 @@ def get_data_li(district_li, current_year, data_time):
 def statistic_shanxi_data():
     req_dic = request.get_json()
     flag = req_dic['flag']  # 1项目签约金额完成情况, 2新开工项目计划投资额完成情况, 3固定资产投资项目资金到位完成情况
-    data_time = req_dic['data_time']  # ["2022", "07", "18"]
-    data_time = data_time[0] + '年' + data_time[1] + '-' + data_time[2] + '月'
+    # data_time = req_dic['data_time']  # ["2022", "07", "18"]
+    # data_time = data_time[0] + '年' + data_time[1] + '-' + data_time[2] + '月'
     try:
         # 获取最新的时间周期
         data_obj = ShanxiTarget.query.order_by(sqlalchemy.desc(ShanxiTarget.id)).first()
         data_time1 = data_obj.data_time
-        if not data_time1:
-            # 获取最新时间周期的数据
-            target_obj_li = ShanxiTarget.query.filter_by(data_time=data_time1, is_delete=0).all()
-        else:
-            # 获取所选时间周期条件的数据
-            target_obj_li = ShanxiTarget.query.filter_by(data_time=data_time, is_delete=0).all()
+        target_obj_li = ShanxiTarget.query.filter_by(data_time=data_time1, is_delete=0).all()
+
+        # if not data_time1:
+        #     # 获取最新时间周期的数据
+        #     target_obj_li = ShanxiTarget.query.filter_by(data_time=data_time1, is_delete=0).all()
+        # else:
+        #     # 获取所选时间周期条件的数据
+        #     target_obj_li = ShanxiTarget.query.filter_by(data_time=data_time, is_delete=0).all()
 
         data1 = ''
         data2 = ''
@@ -401,13 +393,13 @@ def statistic_shanxi_data():
 @api_manage.route("/StatisticJcData", methods=["POST"])
 def statistic_jc_data():
     req_dic = request.get_json()
-    data_time = req_dic['data_time']
+    # data_time = req_dic['data_time']
 
     current_year = datetime.now().year
     district_li = ["全市", "城区", "泽州县", "高平市", "阳城县", "陵川县",
                    "沁水县", "晋城经济技术开发区"]
     try:
-        data_li1, data_li2, data_li3, data_li4, data_li5 = get_data_li(district_li, current_year, data_time)
+        data_li1, data_li2, data_li3, data_li4, data_li5 = get_data_li(district_li, current_year)
 
         # 六。综合得分
         data_li6 = get_data6(district_li, current_year)

apps/view_atlas/view.py

@@ -93,6 +93,7 @@ def industry_cluster():
     try:
         industry_obj = IndustryChain.query.filter_by(industry_name=industry_name).first()
         industry_id = industry_obj.id
+        # 查询redis
 
         result = {
             "industryChain": industry_name,