|
@@ -116,6 +116,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
Set<String> hasMonths = typeDateMapEntry.getValue().stream().map(d -> DateUtil.dateToString(d.getMonth(), "yyyy-MM-dd")).collect(Collectors.toSet());
|
|
|
LocalDate currentMonthDate = startDate;
|
|
|
while (currentMonthDate.compareTo(endDate)<=0){
|
|
|
+ if(IndexDataType.HOMEWORK_CREATE_RATE.equals(typeDateMapEntry.getKey())
|
|
|
+ ||IndexDataType.FINANCE_BALANCE_AMOUNT.equals(typeDateMapEntry.getKey())
|
|
|
+ ||IndexDataType.FINANCE_AMOUNT.equals(typeDateMapEntry.getKey())){
|
|
|
+ currentMonthDate = currentMonthDate.plusDays(1);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
if(hasMonths.contains(currentMonthDate.toString())){
|
|
|
currentMonthDate = currentMonthDate.plusDays(1);
|
|
|
continue;
|