fix20230331

apps/view_radar/view.py

@@ -63,7 +63,8 @@ def tendency():
         else:
         else:
             enterprise = Enterprise.query.filter_by()
             enterprise = Enterprise.query.filter_by()
 
 
-        yearn = 2021  # 现在年份 固定成21
+        # yearn = 2021  # 现在年份 固定成21
+        yearn = datetime.now().year + 1  # 现在年份 固定成21
         scope = [i for i in range(1980, yearn)]  # 年份范围
         scope = [i for i in range(1980, yearn)]  # 年份范围
         months = [(1, 3), (4, 6), (7, 9), (10, 12)]  # 季度
         months = [(1, 3), (4, 6), (7, 9), (10, 12)]  # 季度
         company_num_data = list()
         company_num_data = list()
@@ -87,7 +88,7 @@ def tendency():
             elif select_time == 2:  # 2020年季度(修改为5年季度)
             elif select_time == 2:  # 2020年季度(修改为5年季度)
                 company_num_name = '新增量季度企业个数'
                 company_num_name = '新增量季度企业个数'
                 register_capital_name = '新增量季度注册资本'
                 register_capital_name = '新增量季度注册资本'
-                for yea in range(2016, 2021):
+                for yea in range(2016, yearn):
                     for jd in range(len(months)):
                     for jd in range(len(months)):
                         result = enterprise.filter(and_(extract("year", Enterprise.build_date) == yea,
                         result = enterprise.filter(and_(extract("year", Enterprise.build_date) == yea,
                                                         extract("month", Enterprise.build_date).between(months[jd][0],
                                                         extract("month", Enterprise.build_date).between(months[jd][0],
@@ -102,7 +103,7 @@ def tendency():
             elif select_time == 3:  # 2020年月度（改为3年月度）
             elif select_time == 3:  # 2020年月度（改为3年月度）
                 company_num_name = '新增量月度企业个数'
                 company_num_name = '新增量月度企业个数'
                 register_capital_name = '新增量月度注册资本'
                 register_capital_name = '新增量月度注册资本'
-                for yea in range(2018, 2021):
+                for yea in range(2018, yearn):
                     for m in range(2, 14, 2):
                     for m in range(2, 14, 2):
                         result = enterprise.filter(and_(extract("year", Enterprise.build_date) == yea,
                         result = enterprise.filter(and_(extract("year", Enterprise.build_date) == yea,
                                                         extract("month", Enterprise.build_date) == m))
                                                         extract("month", Enterprise.build_date) == m))
@@ -133,7 +134,7 @@ def tendency():
             elif select_time == 2:  # 2020年季度
             elif select_time == 2:  # 2020年季度
                 company_num_name = '累积量季度企业个数'
                 company_num_name = '累积量季度企业个数'
                 register_capital_name = '累积量季度注册资本'
                 register_capital_name = '累积量季度注册资本'
-                for yea in range(2016, 2021):
+                for yea in range(2016, yearn):
                     for jd in range(len(months)):
                     for jd in range(len(months)):
                         result = enterprise.filter(and_(extract("year", Enterprise.build_date) == yea,
                         result = enterprise.filter(and_(extract("year", Enterprise.build_date) == yea,
                                                         extract("month", Enterprise.build_date) <= months[jd][1]))
                                                         extract("month", Enterprise.build_date) <= months[jd][1]))
@@ -149,7 +150,7 @@ def tendency():
             elif select_time == 3:  # 2020年月度
             elif select_time == 3:  # 2020年月度
                 company_num_name = '累积量月度企业个数'
                 company_num_name = '累积量月度企业个数'
                 register_capital_name = '累积量月度注册资本'
                 register_capital_name = '累积量月度注册资本'
-                for yea in range(2018, 2021):
+                for yea in range(2018, yearn):
                     for m in range(2, 14, 2):
                     for m in range(2, 14, 2):
                         result = enterprise.filter(and_(extract("year", Enterprise.build_date) == yea,
                         result = enterprise.filter(and_(extract("year", Enterprise.build_date) == yea,
                                                         extract("month", Enterprise.build_date) <= m))
                                                         extract("month", Enterprise.build_date) <= m))