Skip to content

T
tamp_fund
Commit f6b1f0bf authored by zp's avatar zp
Browse files
Options

Merge branch 'master' of 47.100.44.39:zhoupeng/tamp_fund

parents d0672eaa 83afe43d
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
src/main/java/com/tanpu/fund/service/impl/ProductServiceImpl.java
View file @ f6b1f0bf
...@@ -780,8 +780,8 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -780,8 +780,8 @@ public class ProductServiceImpl implements ProductService, Constant {
FundNav pre = fundNavs.get(i + 1); FundNav pre = fundNavs.get(i + 1);
if (pre.getNav().compareTo(BigDecimal.ZERO) == 1) { if (pre.getNav().compareTo(BigDecimal.ZERO) == 1) {
BigDecimal dailyIncrease = f.getNav().subtract(pre.getNav()).divide(pre.getNav(), 2, BigDecimal.ROUND_HALF_UP); BigDecimal dailyIncrease = f.getNav().subtract(pre.getNav()).divide(pre.getNav(), 4, BigDecimal.ROUND_HALF_UP);
vo.setDailyIncrease(BigDecimalUtil.toString(dailyIncrease, 2)); vo.setDailyIncrease(BigDecimalUtil.multiply100(dailyIncrease));
} }
} }
} }
...@@ -813,17 +813,17 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -813,17 +813,17 @@ public class ProductServiceImpl implements ProductService, Constant {
return Lists.newArrayList( return Lists.newArrayList(
new RiskRatingVO("最近一年", multiply100(fundCount.getMaxdrawdown1y()), new RiskRatingVO("最近一年", multiply100(fundCount.getMaxdrawdown1y()),
multiply100(fundCount.getStddev1y()), BigDecimalUtil.toString(fundCount.getSharperatio1y()), BigDecimalUtil.toString(fundCount.getRet1y())), multiply100(fundCount.getStddev1y()), multiply100(fundCount.getSharperatio1y()), multiply100(fundCount.getRet1y())),
new RiskRatingVO("最近二年", multiply100(fundCount.getMaxdrawdown2y()), new RiskRatingVO("最近二年", multiply100(fundCount.getMaxdrawdown2y()),
multiply100(fundCount.getStddev2y()), BigDecimalUtil.toString(fundCount.getSharperatio2y()), BigDecimalUtil.toString(fundCount.getRet2yA())), multiply100(fundCount.getStddev2y()), multiply100(fundCount.getSharperatio2y()), multiply100(fundCount.getRet2yA())),
new RiskRatingVO("最近三年", multiply100(fundCount.getMaxdrawdown3y()), new RiskRatingVO("最近三年", multiply100(fundCount.getMaxdrawdown3y()),
multiply100(fundCount.getStddev3y()), BigDecimalUtil.toString(fundCount.getSharperatio3y()), BigDecimalUtil.toString(fundCount.getRet3yA())), multiply100(fundCount.getStddev3y()), multiply100(fundCount.getSharperatio3y()), multiply100(fundCount.getRet3yA())),
new RiskRatingVO("最近四年", multiply100(fundCount.getMaxdrawdown4y()), new RiskRatingVO("最近四年", multiply100(fundCount.getMaxdrawdown4y()),
multiply100(fundCount.getStddev4y()), BigDecimalUtil.toString(fundCount.getSharperatio4y()), BigDecimalUtil.toString(fundCount.getRet4yA())), multiply100(fundCount.getStddev4y()), multiply100(fundCount.getSharperatio4y()), multiply100(fundCount.getRet4yA())),
new RiskRatingVO("最近五年", multiply100(fundCount.getMaxdrawdown5y()), new RiskRatingVO("最近五年", multiply100(fundCount.getMaxdrawdown5y()),
multiply100(fundCount.getStddev5y()), BigDecimalUtil.toString(fundCount.getSharperatio5y()), BigDecimalUtil.toString(fundCount.getRet5yA())), multiply100(fundCount.getStddev5y()), multiply100(fundCount.getSharperatio5y()), multiply100(fundCount.getRet5yA())),
new RiskRatingVO("成立以来", multiply100(fundCount.getMaxdrawdownIncep()), new RiskRatingVO("成立以来", multiply100(fundCount.getMaxdrawdownIncep()),
multiply100(fundCount.getStddevIncep()), BigDecimalUtil.toString(fundCount.getSharperatioIncep()), BigDecimalUtil.toString(fundCount.getRetIncepA()))); multiply100(fundCount.getStddevIncep()), multiply100(fundCount.getSharperatioIncep()), multiply100(fundCount.getRetIncepA())));
} }
@Override @Override
...@@ -1498,17 +1498,17 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -1498,17 +1498,17 @@ public class ProductServiceImpl implements ProductService, Constant {
return Lists.newArrayList( return Lists.newArrayList(
new RiskRatingVO("最近一年", multiply100(fundCount.getMaxdrawdown1y()), new RiskRatingVO("最近一年", multiply100(fundCount.getMaxdrawdown1y()),
multiply100(fundCount.getStddev1y()), BigDecimalUtil.toString(fundCount.getSharperatio1y()), BigDecimalUtil.toString(fundCount.getRet1y())), multiply100(fundCount.getStddev1y()), multiply100(fundCount.getSharperatio1y()), multiply100(fundCount.getRet1y())),
new RiskRatingVO("最近二年", multiply100(fundCount.getMaxdrawdown2y()), new RiskRatingVO("最近二年", multiply100(fundCount.getMaxdrawdown2y()),
multiply100(fundCount.getStddev2y()), BigDecimalUtil.toString(fundCount.getSharperatio2y()), BigDecimalUtil.toString(fundCount.getRet2yA())), multiply100(fundCount.getStddev2y()), multiply100(fundCount.getSharperatio2y()), multiply100(fundCount.getRet2yA())),
new RiskRatingVO("最近三年", multiply100(fundCount.getMaxdrawdown3y()), new RiskRatingVO("最近三年", multiply100(fundCount.getMaxdrawdown3y()),
multiply100(fundCount.getStddev3y()), BigDecimalUtil.toString(fundCount.getSharperatio3y()), BigDecimalUtil.toString(fundCount.getRet3yA())), multiply100(fundCount.getStddev3y()), multiply100(fundCount.getSharperatio3y()), multiply100(fundCount.getRet3yA())),
new RiskRatingVO("最近四年", multiply100(fundCount.getMaxdrawdown4y()), new RiskRatingVO("最近四年", multiply100(fundCount.getMaxdrawdown4y()),
multiply100(fundCount.getStddev4y()), BigDecimalUtil.toString(fundCount.getSharperatio4y()), BigDecimalUtil.toString(fundCount.getRet4yA())), multiply100(fundCount.getStddev4y()), multiply100(fundCount.getSharperatio4y()), multiply100(fundCount.getRet4yA())),
new RiskRatingVO("最近五年", multiply100(fundCount.getMaxdrawdown5y()), new RiskRatingVO("最近五年", multiply100(fundCount.getMaxdrawdown5y()),
multiply100(fundCount.getStddev5y()), BigDecimalUtil.toString(fundCount.getSharperatio5y()), BigDecimalUtil.toString(fundCount.getRet5yA())), multiply100(fundCount.getStddev5y()), multiply100(fundCount.getSharperatio5y()), multiply100(fundCount.getRet5yA())),
new RiskRatingVO("成立以来", multiply100(fundCount.getMaxdrawdownIncep()), new RiskRatingVO("成立以来", multiply100(fundCount.getMaxdrawdownIncep()),
multiply100(fundCount.getStddevIncep()), BigDecimalUtil.toString(fundCount.getSharperatioIncep()), BigDecimalUtil.toString(fundCount.getRetIncepA()))); multiply100(fundCount.getStddevIncep()), multiply100(fundCount.getSharperatioIncep()), multiply100(fundCount.getRetIncepA())));
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment