Browse Source

fix:修复bug

wangzaijun 10 months ago
parent
commit
39c76b7c4b

+ 1 - 0
src/main/java/com/smppw/core/IndicatorService.java

@@ -562,6 +562,7 @@ public class IndicatorService {
                 List<DateValue> secIdValidNav = IndicatorCalcUtil.getSecIdValidNav(mainSecId, indicatorCalcTimeRangeDto, defaultIntervalNavMap, false, defaultFrequency);
                 if (secIdValidNav != null && secIdValidNav.size() > 0) {
                     dateIntervalDto.setStartDate(secIdValidNav.get(0).getDate());
+                    dateIntervalDto.setEndDate(secIdValidNav.get(secIdValidNav.size() - 1).getDate());
                 }
             }
         }

+ 4 - 0
src/main/java/com/smppw/utils/DateIntervalUtil.java

@@ -265,6 +265,10 @@ public class DateIntervalUtil {
         }
 
         String endDate = getEndDateByDataPointReq(dateIntervalDto.getEndDate(), maxNew, minIncept);
+        // 截止日期比最大净值日期大时
+        if (endDate.compareTo(maxNew) > 0) {
+            endDate = maxNew;
+        }
 
         String startDate = getDateByDataPointReq(dateIntervalDto.getStartDate(), endDate, maxNew, minIncept, dateIntervalDto.getTimeRange());