fix20230111

apps/inves_manage/project_manager.py

@@ -881,10 +881,10 @@ def shanxi_data_list():
         return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败，请重新登陆后尝试！")
         return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败，请重新登陆后尝试！")
     req_dic = request.get_json()
     req_dic = request.get_json()
     year = req_dic['year']
     year = req_dic['year']
-    # current_year = datetime.now().year
+    current_year = datetime.now().year
     try:
     try:
         target_obj_list = ShanxiTarget.query.filter(
         target_obj_list = ShanxiTarget.query.filter(
-            ShanxiTarget.data_time.like('%{}%'.format(year) if year else year),
+            ShanxiTarget.data_time.like('%{}%'.format(year) if year else current_year),
             ShanxiTarget.is_delete == 0
             ShanxiTarget.is_delete == 0
         ).all()
         ).all()
         data_time_set = set(target_obj.data_time for target_obj in target_obj_list)
         data_time_set = set(target_obj.data_time for target_obj in target_obj_list)

apps/inves_manage/statistic_analysis_view.py

@@ -417,7 +417,7 @@ def statistic_shanxi_data():
                 "district_name": target_obj.district_name,
                 "district_name": target_obj.district_name,
                 "sign_money": round(target_obj.sign_money / 10000, 2),
                 "sign_money": round(target_obj.sign_money / 10000, 2),
                 "sign_target_money": round(target_obj.sign_target_money / 10000, 2),
                 "sign_target_money": round(target_obj.sign_target_money / 10000, 2),
-                "sign_finish_rate": round(target_obj.sign_finish_rate / 100, 2),
+                "sign_finish_rate": round(target_obj.sign_finish_rate, 2),
             } for target_obj in target_obj_li]
             } for target_obj in target_obj_li]
             data1 = sorted(data, key=lambda x: x['sign_money'], reverse=True)
             data1 = sorted(data, key=lambda x: x['sign_money'], reverse=True)
             data2 = sorted(data1, key=lambda x: x['sign_finish_rate'], reverse=True)
             data2 = sorted(data1, key=lambda x: x['sign_finish_rate'], reverse=True)