fix20230111

apps/inves_manage/project_manager.py

@@ -1001,6 +1001,12 @@ def shanxi_data_detail():
     req_dic = request.get_json()
     req_dic = request.get_json()
     data_time = req_dic["data_time"]
     data_time = req_dic["data_time"]
     try:
     try:
+        if not data_time:
+            # 获取最新的时间周期
+            data_obj = ShanxiTarget.query.order_by(sqlalchemy.desc(ShanxiTarget.id)).first()
+            data_time = data_obj.data_time
+            target_obj_li = ShanxiTarget.query.filter_by(data_time=data_time, 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_time, is_delete=0).all()
         data = [{
         data = [{
             "id": target_obj.id,
             "id": target_obj.id,

apps/inves_manage/statistic_analysis_view.py

@@ -426,7 +426,7 @@ def statistic_shanxi_data():
                 "district_name": target_obj.district_name,
                 "district_name": target_obj.district_name,
                 "plan_invest_money": round(target_obj.plan_invest_money / 10000, 2),
                 "plan_invest_money": round(target_obj.plan_invest_money / 10000, 2),
                 "plan_target_money": round(target_obj.plan_target_money / 10000, 2),
                 "plan_target_money": round(target_obj.plan_target_money / 10000, 2),
-                "plan_finish_rate": target_obj.plan_finish_rate,
+                "plan_finish_rate": round(target_obj.plan_finish_rate, 2),
             } for target_obj in target_obj_li]
             } for target_obj in target_obj_li]
             data1 = sorted(data, key=lambda x: x['plan_invest_money'], reverse=True)
             data1 = sorted(data, key=lambda x: x['plan_invest_money'], reverse=True)
             data2 = sorted(data1, key=lambda x: x['plan_finish_rate'], reverse=True)
             data2 = sorted(data1, key=lambda x: x['plan_finish_rate'], reverse=True)