From d634731a368cf0128c98a0942511c948dc9e7bea Mon Sep 17 00:00:00 2001
From: jackluson <18219112108@163.com>
Date: Fri, 11 Nov 2022 22:20:26 +0800
Subject: [PATCH] chore: update submodule

---
 outcome           | 2 +-
 src/crud/query.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/outcome b/outcome
index 6e2b3f6..246fea9 160000
--- a/outcome
+++ b/outcome
@@ -1 +1 @@
-Subproject commit 6e2b3f6f62edffbf72884b3af7916c48eecde37d
+Subproject commit 246fea9b492178795cb3b4f0ff0ffb6c938946c7
diff --git a/src/crud/query.py b/src/crud/query.py
index 25a8a36..f24ca9f 100644
--- a/src/crud/query.py
+++ b/src/crud/query.py
@@ -24,6 +24,7 @@ def query_high_score_funds(quarter_index):
     words = ['%指数%', '%C', '%E', '%H%']
     rule = and_(*[FundBase.fund_name.notlike(w) for w in words])
     res =  session.query(FundQuarter,ManagerAssoc,FundBase).where(FundQuarter.fund_code == ManagerAssoc.fund_code).where(FundQuarter.fund_code == FundBase.fund_code).filter(FundQuarter.quarter_index == quarter_index, \
+    ManagerAssoc.quarter_index >= quarter_index,
     FundQuarter.morning_star_rating_5 >= 3, # 5年评级大于等于3
     FundQuarter.morning_star_rating_3 == 5, # 3年评级等于5
     FundQuarter.stock_position_total >= 50, # 股票仓位大于50
@@ -34,7 +35,7 @@ def query_high_score_funds(quarter_index):
     FundQuarter.risk_rating_5 > 1, # 5年风险评级大于1
     # ManagerAssoc.manager_start_date < last_year_date, # 至少任职该基金一年
     FundQuarter.total_asset < 100, # 总规模资金小于100亿
-    ).filter(rule).all()
+    ).filter(rule).order_by(FundQuarter.risk_assessment_sharpby.desc()).all()
     return res
 
 def query_all_fund():