From a7dc0e861dede7cef13cfcb00a286783b937d255 Mon Sep 17 00:00:00 2001 From: jackluson <18219112108@163.com> Date: Tue, 2 Nov 2021 21:27:51 +0800 Subject: [PATCH] feat: supplement main entry --- main.py | 5 ++++- src/fund_statistic.py | 4 +++- src/fund_strategy.py | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index 2ebee49..5326468 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ from src.acquire_fund_base import acquire_fund_base from src.fund_info.supplement import FundSupplement from src.acquire_fund_quarter import acquire_fund_quarter from src.fund_statistic import get_special_fund_code_holder_stock_detail, all_stocks_rank,t100_stocks_rank,all_stock_holder_detail - +from src.fund_strategy import output_high_score_funds def main(): input_value = input("请输入下列序号执行操作:\n \ @@ -30,6 +30,7 @@ def main(): 6.“基金持仓股排名”\n \ 7.“基金重仓股Top100”\n \ 8.“股票持仓基金明细”\n \ + 9.“高分基金”\n \ 输入:") if input_value == '1' or input_value == '快照': page_index = 1 @@ -50,6 +51,8 @@ def main(): t100_stocks_rank() elif input_value == '8' or input_value == "股票持仓基金明细": all_stock_holder_detail() + elif input_value == '9' or input_value == "高分基金": + output_high_score_funds() else: print('输入有误') diff --git a/src/fund_statistic.py b/src/fund_statistic.py index b515e3d..eb9da49 100644 --- a/src/fund_statistic.py +++ b/src/fund_statistic.py @@ -123,8 +123,10 @@ def stocks_compare(stock_list, *, market=None, quarter_index=None, fund_code_poo return filter_list -def t100_stocks_rank(quarter_index=None, *, each_statistic): +def t100_stocks_rank(each_statistic=None, *, quarter_index=None): # T100权重股排名 + if each_statistic == None: + each_statistic = FundStatistic() if quarter_index == None: quarter_index = get_last_quarter_str(1) last_quarter_index = get_last_quarter_str(2) diff --git a/src/fund_strategy.py b/src/fund_strategy.py index 7ac9c32..adb9a60 100644 --- a/src/fund_strategy.py +++ b/src/fund_strategy.py @@ -10,15 +10,16 @@ Copyright (c) 2021 Camel Lu from utils.index import get_last_quarter_str, update_xlsx_file from sql_model.fund_query import FundQuery -import os from pprint import pprint import pandas as pd -def output_high_score_funds(each_query, quarter_index=None): +def output_high_score_funds(each_query=None, quarter_index=None): """ 输出高分基金 """ + if each_query == None: + each_query = FundQuery() if quarter_index == None: quarter_index = get_last_quarter_str() print("quarter_index", quarter_index)