Commit 9fe3a82a by shenjunjie

Merge branch 'release' into 'master'

Release

See merge request !447
parents a1d9d897 81dedb79
......@@ -58,16 +58,17 @@ public class IndexUtil {
start = truncDate(start, pattern);
end = truncDate(end, pattern);
List<String> list = Lists.newArrayList();
Period period = new Period(start.getTime(), end.getTime(), PeriodType.months());
Period monthPeriod = new Period(start.getTime(), end.getTime(), PeriodType.months());
Period yearPeriod = new Period(start.getTime(), end.getTime(), PeriodType.years());
switch (pattern) {
case "yyyy": {
for (int i = 0; i <= period.getYears(); i++) {
for (int i = 0; i <= yearPeriod.getYears(); i++) {
list.add(index + "_" + DF_yyyy.format(DateUtils.addYears(start, i)));
}
break;
}
case "yyyyMM": {
for (int i = 0; i <= period.getMonths(); i++) {
for (int i = 0; i <= monthPeriod.getMonths(); i++) {
list.add(index + "_" + DF_yyyyMM.format(DateUtils.addMonths(start, i)));
}
break;
......
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