基金详情

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

@@ -720,14 +720,14 @@ public class ProductServiceImpl implements ProductService, Constant {
 
     private ArrayList<TrackRecordVO> getTrackRecordVOS(FundCount fundCount) {
         return Lists.newArrayList(
-                new TrackRecordVO("近三个月", multiply100(fundCount.getRet3m()), multiply100(fundCount.getRet3mBm1())),
-                new TrackRecordVO("近半年", multiply100(fundCount.getRet6m()), multiply100(fundCount.getRet6mBm1())),
-                new TrackRecordVO("近一年", multiply100(fundCount.getRet1y()), multiply100(fundCount.getRet1yBm1())),
-                new TrackRecordVO("近二年", multiply100(fundCount.getRet2y()), multiply100(fundCount.getRet2yBm1())),
-                new TrackRecordVO("近三年", multiply100(fundCount.getRet3y()), multiply100(fundCount.getRet3yBm1())),
-                new TrackRecordVO("近四年", multiply100(fundCount.getRet4y()), multiply100(fundCount.getRet4yBm1())),
-                new TrackRecordVO("近五年", multiply100(fundCount.getRet5y()), multiply100(fundCount.getRet5yBm1())),
-                new TrackRecordVO("成立以来", multiply100(fundCount.getRetIncep()), multiply100(fundCount.getRetIncepBm1())));
+                new TrackRecordVO("近三个月", multiply100(fundCount.getRet3m()), multiply100(fundCount.getRet3mBm1()), fundCount.getEndDate() == null ? null : fundCount.getEndDate().getTime()),
+                new TrackRecordVO("近半年", multiply100(fundCount.getRet6m()), multiply100(fundCount.getRet6mBm1()), fundCount.getEndDate() == null ? null : fundCount.getEndDate().getTime()),
+                new TrackRecordVO("近一年", multiply100(fundCount.getRet1y()), multiply100(fundCount.getRet1yBm1()), fundCount.getEndDate() == null ? null : fundCount.getEndDate().getTime()),
+                new TrackRecordVO("近二年", multiply100(fundCount.getRet2y()), multiply100(fundCount.getRet2yBm1()), fundCount.getEndDate() == null ? null : fundCount.getEndDate().getTime()),
+                new TrackRecordVO("近三年", multiply100(fundCount.getRet3y()), multiply100(fundCount.getRet3yBm1()), fundCount.getEndDate() == null ? null : fundCount.getEndDate().getTime()),
+                new TrackRecordVO("近四年", multiply100(fundCount.getRet4y()), multiply100(fundCount.getRet4yBm1()), fundCount.getEndDate() == null ? null : fundCount.getEndDate().getTime()),
+                new TrackRecordVO("近五年", multiply100(fundCount.getRet5y()), multiply100(fundCount.getRet5yBm1()), fundCount.getEndDate() == null ? null : fundCount.getEndDate().getTime()),
+                new TrackRecordVO("成立以来", multiply100(fundCount.getRetIncep()), multiply100(fundCount.getRetIncepBm1()), fundCount.getEndDate() == null ? null : fundCount.getEndDate().getTime()));
     }
 
     @Override