Merge remote-tracking branch 'origin/bug_20210313' into v2.0.0

.gitignore

@@ -70,7 +70,9 @@ typings/
 *.iml
 out
 gen
-
+.classpath
+.project
+.settings
 # maven
 target
 .classpath

.settings/org.eclipse.jdt.apt.core.prefs

+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=target\\generated-sources\\annotations
+org.eclipse.jdt.apt.genTestSrcDir=target\\generated-test-sources\\test-annotations

src/main/java/com/tanpu/fund/service/impl/ProductPrivateServiceImpl.java

@@ -161,7 +161,7 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan
     public List<FundManagerVO> getFundManager(String id, String ifaId) {
         FundManagerMappingExample example = new FundManagerMappingExample();
         example.createCriteria().andFundIdEqualTo(id).andDeleteTagEqualTo(ZERO_NUM);
-        example.setOrderByClause("update_time desc");
+        example.setOrderByClause("management_start_date desc,id desc");
 
         List<String> list = this.fundManagerMappingMapper.selectByExample(example).stream()
                 .map(FundManagerMapping::getFundManagerId).collect(Collectors.toList());

src/main/java/com/tanpu/fund/service/impl/ProductServiceImpl.java

@@ -821,17 +821,17 @@ public class ProductServiceImpl implements ProductService, Constant {
 
         return Lists.newArrayList(
                 new RiskRatingVO("最近一年", multiply100(fundCount.getMaxdrawdown1y()),
-                        multiply100(fundCount.getStddev1y()), multiply100(fundCount.getSharperatio1y()), multiply100(fundCount.getRet1y())),
+                        multiply100(fundCount.getStddev1y()), BigDecimalUtil.toString(fundCount.getSharperatio1y()), multiply100(fundCount.getRet1y())),
                 new RiskRatingVO("最近二年", multiply100(fundCount.getMaxdrawdown2y()),
-                        multiply100(fundCount.getStddev2y()), multiply100(fundCount.getSharperatio2y()), multiply100(fundCount.getRet2yA())),
+                        multiply100(fundCount.getStddev2y()), BigDecimalUtil.toString(fundCount.getSharperatio2y()), multiply100(fundCount.getRet2yA())),
                 new RiskRatingVO("最近三年", multiply100(fundCount.getMaxdrawdown3y()),
-                        multiply100(fundCount.getStddev3y()), multiply100(fundCount.getSharperatio3y()), multiply100(fundCount.getRet3yA())),
+                        multiply100(fundCount.getStddev3y()), BigDecimalUtil.toString(fundCount.getSharperatio3y()), multiply100(fundCount.getRet3yA())),
                 new RiskRatingVO("最近四年", multiply100(fundCount.getMaxdrawdown4y()),
-                        multiply100(fundCount.getStddev4y()), multiply100(fundCount.getSharperatio4y()), multiply100(fundCount.getRet4yA())),
+                        multiply100(fundCount.getStddev4y()), BigDecimalUtil.toString(fundCount.getSharperatio4y()), multiply100(fundCount.getRet4yA())),
                 new RiskRatingVO("最近五年", multiply100(fundCount.getMaxdrawdown5y()),
-                        multiply100(fundCount.getStddev5y()), multiply100(fundCount.getSharperatio5y()), multiply100(fundCount.getRet5yA())),
+                        multiply100(fundCount.getStddev5y()), BigDecimalUtil.toString(fundCount.getSharperatio5y()), multiply100(fundCount.getRet5yA())),
                 new RiskRatingVO("成立以来", multiply100(fundCount.getMaxdrawdownIncep()),
-                        multiply100(fundCount.getStddevIncep()), multiply100(fundCount.getSharperatioIncep()), multiply100(fundCount.getRetIncepA())));
+                        multiply100(fundCount.getStddevIncep()), BigDecimalUtil.toString(fundCount.getSharperatioIncep()), multiply100(fundCount.getRetIncepA())));
     }
 
     @Override