fix20230619

apps/inves_manage/statistic_analysis_view.py

@@ -671,6 +671,15 @@ def get_data3(data_time, district_li, max_year):
 # 固定资产投资项目到位资金完成率
 def get_data4(data_time, district_li, max_year):
     data_li4 = []
+    data_time1 = ''
+    if not data_time:
+        data_time1 = str(max_year) + '年'
+    elif data_time and not data_time[2]:
+        data_time1 = data_time[0] + '年' + data_time[1] + '月'  # ["2022", "01", ""]
+    elif all([data_time[0], data_time[1], data_time[2]]):
+        data_time1 = data_time[0] + '年' + data_time[1] + '-' + data_time[2] + '月'
+    else:
+        pass
 
     try:
         for district in district_li:
@@ -683,12 +692,15 @@ def get_data4(data_time, district_li, max_year):
             for jc_obj in jc_obj_list:
                 year_list.append(int(jc_obj.year.split('年')[0]))
             max_year = max(set(year_list))
-
+            print(district)
+            if '开发区' in district:
+                district = '开发区'
             project_obj = MoneyArrive.query.filter(
                 # MoneyArrive.data_time.like('%{}%'.format(data_time[0]) if data_time else str(max_year)),
-                MoneyArrive.data_time.like('%{}%'.format(str(data_time[0]) if data_time else str(max_year))),
+                MoneyArrive.data_time.like('%{}%'.format(str(data_time1) if data_time else str(max_year))),
                 MoneyArrive.is_delete == 0,
-                MoneyArrive.district_name == district
+                # MoneyArrive.district_name == district
+                MoneyArrive.district_name.like('%{}%'.format(district))
             ).first()
             if not project_obj:
                 arrive_money = 0
@@ -706,7 +718,7 @@ def get_data4(data_time, district_li, max_year):
                 year_target = jc_obj.money_arrive_target1
 
             data = {
-                "name": district,
+                "name": '晋城经济技术开发区' if '开发区' in district else district,
                 "data": arrive_money,
                 "target": year_target,
                 "value": round(arrive_money / year_target * 100, 2) if year_target and year_target != 0 else 0
@@ -1414,6 +1426,7 @@ def project_graph():
     industry_name = req_dic['industry_name']  # 用于4项目行业类型分布
     data_time = req_dic['data_time']  # ["2022", "01", "12"]
     current_year = datetime.now().year
+    # current_year = 2022
     now_time3 = ''
     now_time4 = ''
     now_time = datetime.now().strftime('%Y-%m-01 00:00:00')