fix20230303

apps/inves_manage/statistic_analysis_view.py

@@ -440,7 +440,7 @@ def statistic_shanxi_data():
     req_dic = request.get_json()
     flag = req_dic['flag']  # 1项目签约金额完成情况, 2新开工项目计划投资额完成情况, 3固定资产投资项目资金到位完成情况
     data_time = req_dic['data_time']  # "2022年01-09月"
-
+    data_time1 = ''
     try:
         # 获取最新的时间周期
         if not data_time:
@@ -451,16 +451,13 @@ def statistic_shanxi_data():
         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()
 
         data1 = ''
         data2 = ''
         if flag == 1:
             data = [{
                 "district_name": target_obj.district_name,
-                # "sign_money": round(target_obj.sign_money / 10000, 2),
                 "sign_money": target_obj.sign_money,
-                # "sign_target_money": round(target_obj.sign_target_money / 10000, 2),
                 "sign_target_money": target_obj.sign_target_money,
                 "sign_finish_rate": round(target_obj.sign_finish_rate, 2),
             } for target_obj in target_obj_li]
@@ -469,8 +466,6 @@ def statistic_shanxi_data():
         if flag == 2:
             data = [{
                 "district_name": target_obj.district_name,
-                # "plan_invest_money": round(target_obj.plan_invest_money / 10000, 2),
-                # "plan_target_money": round(target_obj.plan_target_money / 10000, 2),
                 "plan_invest_money": target_obj.plan_invest_money,
                 "plan_target_money": target_obj.plan_target_money,
                 "plan_finish_rate": round(target_obj.plan_finish_rate, 2),
@@ -480,20 +475,17 @@ def statistic_shanxi_data():
         if flag == 3:
             data = [{
                 "district_name": target_obj.district_name,
-                # "arrive_money": round(target_obj.arrive_money / 10000, 2),
                 "arrive_money": target_obj.arrive_money,
-                # "arrive_target_money": round(target_obj.arrive_target_money / 10000, 2),
                 "arrive_target_money": target_obj.arrive_target_money,
                 "arrive_finish_rate": round(target_obj.arrive_finish_rate, 2)
             } for target_obj in target_obj_li]
             data1 = sorted(data, key=lambda x: x['arrive_money'], reverse=True)
             data2 = sorted(data1, key=lambda x: x['arrive_finish_rate'], reverse=True)
         if not data_time:
-            # now_time = datetime.now().strftime('%Y-%m-01 00:00:00')
-            now_time = (datetime.now() - relativedelta(years=1)).strftime('%Y-%m-%d')
-            now_time = now_time.split('-')
-            data_time = now_time[0] + '年' + now_time[1] + '月' + now_time[2] + '号-至今'
-            return jsonify(code=RET.OK, data={"data1": data1, "data2": data2, "time": data_time}, msg="获取成功！")
+        #     now_time = (datetime.now() - relativedelta(years=1)).strftime('%Y-%m-%d')
+        #     now_time = now_time.split('-')
+        #     data_time = now_time[0] + '年' + now_time[1] + '月' + now_time[2] + '号-至今'
+            return jsonify(code=RET.OK, data={"data1": data1, "data2": data2, "time": data_time1}, msg="获取成功！")
         return jsonify(code=RET.OK, data={"data1": data1, "data2": data2, "time": data_time}, msg="获取成功！")
     except Exception as e:
         db.session.rollback()