fix20221220

apps/inves_manage/statistic_analysis_view.py

@@ -52,7 +52,7 @@ def get_data1(district_li, current_year):
 
             data = {
                 "name": district,
-                "value": round(investment_volume / year_target * 100, 2) if year_target and year_target != 0 else 0
+                "value": round(investment_volume / 10000 / year_target * 100, 2) if year_target and year_target != 0 else 0
             }
             data_li1.append(data)
             continue
@@ -60,6 +60,7 @@ def get_data1(district_li, current_year):
         current_app.logger.error(e)
         print('项目签约完成率计算出错', e)
         return 'error'
+    data_li1 = sorted(data_li1, key=lambda x: x['value'], reverse=True)
     return data_li1
 
 
@@ -91,6 +92,7 @@ def get_data2(district_li, current_year):
         current_app.logger.error(e)
         print('项目开工率计算出错', e)
         return 'error'
+    data_li2 = sorted(data_li2, key=lambda x: x['value'], reverse=True)
     return data_li2
 
 
@@ -120,7 +122,7 @@ def get_data3(district_li, current_year):
 
             data = {
                 "name": district,
-                "value": round(investment_volume / year_target * 100, 2) if year_target and year_target != 0 else 0
+                "value": round(investment_volume / 10000 / year_target * 100, 2) if year_target and year_target != 0 else 0
             }
             data_li3.append(data)
             continue
@@ -128,6 +130,7 @@ def get_data3(district_li, current_year):
         current_app.logger.error(e)
         print('新开工项目计划投资额完成率计算出错', e)
         return 'error'
+    data_li3 = sorted(data_li3, key=lambda x: x['value'], reverse=True)
     return data_li3
 
 
@@ -156,7 +159,7 @@ def get_data4(district_li, current_year):
 
             data = {
                 "name": district,
-                "value": round(arrive_money / year_target * 100, 2) if year_target and year_target != 0 else 0
+                "value": round(arrive_money / 10000 / year_target * 100, 2) if year_target and year_target != 0 else 0
             }
             data_li4.append(data)
             continue
@@ -164,6 +167,7 @@ def get_data4(district_li, current_year):
         current_app.logger.error(e)
         print('固定资产投资项目到位资金完成率计算出错', e)
         return 'error'
+    data_li4 = sorted(data_li4, key=lambda x: x['value'], reverse=True)
     return data_li4
 
 
@@ -193,7 +197,7 @@ def get_data5(district_li, current_year):
                 year_target = jc_obj.money_arrive_target0
             data = {
                 "name": district,
-                "value": round(investment_volume / year_target * 100, 2) if year_target and year_target != 0 else 0
+                "value": round(investment_volume / 10000 / year_target * 100, 2) if year_target and year_target != 0 else 0
             }
             data_li5.append(data)
             continue
@@ -201,6 +205,7 @@ def get_data5(district_li, current_year):
         current_app.logger.error(e)
         print('非固定资产投资项目到位资金完成率计算出错', e)
         return 'error'
+    data_li5 = sorted(data_li5, key=lambda x: x['value'], reverse=True)
     return data_li5
 
 
@@ -280,6 +285,7 @@ def get_data6(district_li, current_year):
                 grade5 = grade_dic["grade"]
         total_grade = grade1 + grade2 + grade3 + grade4 + grade5
         data_li6.append({"name": district, "value": total_grade})
+    data_li6 = sorted(data_li6, key=lambda x: x['value'], reverse=True)
     return data_li6