Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev

app/service/portfolio_diagnose.py

@@ -981,7 +981,7 @@ class PortfolioDiagnose(object):
             repr(e)
             return None, None, None, None, None
 
-    def single_evaluation(self, fund_id):
+    def single_evaluation(self, fund_id, objective=True):
         """
            1、该基金整体表现优秀/良好/一般，收益能力优秀/良好/合格/较差，回撤控制能力优秀/良好/合格/较差，风险收益比例较高/一般/较低；
            2、在收益方面，该基金年化收益能力高于/持平/低于同类基金平均水平，有x%区间跑赢大盘/指数，绝对收益能力优秀/一般；
@@ -1105,6 +1105,7 @@ class PortfolioDiagnose(object):
             except Exception:
                 pass
 
+        if objective:
             evaluation_dict = {'name': fund_name, 'data': ret}
             if fund_id in self.abandon_fund_score + self.abandon_fund_corr:
                 evaluation_dict['status'] = "换仓"
@@ -1112,12 +1113,12 @@ class PortfolioDiagnose(object):
                 evaluation_dict['status'] = "保留"
         return evaluation_dict
 
-    def old_portfolio_evaluation(self, ):
+    def old_portfolio_evaluation(self, objective=True):
         try:
             result = []
             for fund in self.portfolio:
                 try:
-                    result.append(self.single_evaluation(fund))
+                    result.append(self.single_evaluation(fund), objective)
                 except IndexError:
                     continue
             return result