|
|
@ -120,24 +120,24 @@ public class DimQuarterServiceImpl extends BaseServiceImpl<DimQuarterDao, DimQua |
|
|
|
lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_QUARTER); |
|
|
|
} |
|
|
|
|
|
|
|
//Date now = new Date();
|
|
|
|
Date now = DateUtils.parse("20210430", DateUtils.DATE_PATTERN_YYYYMMDD); |
|
|
|
Date now = new Date(); |
|
|
|
//Date now = DateUtils.parse(now, DateUtils.DATE_PATTERN_YYYYMMDD);
|
|
|
|
|
|
|
|
Date targetQuarter; |
|
|
|
Date startQuarter; |
|
|
|
Date targetQMonth;//初始化至,包含当季
|
|
|
|
Date startQMonth;//从该季开始初始化,不包含该季
|
|
|
|
|
|
|
|
targetQuarter = DateUtils.integrate(DateUtils.addDateMonths(now, -3), DateUtils.DATE_PATTERN_YYYYMM); |
|
|
|
targetQMonth = DateUtils.integrate(now, DateUtils.DATE_PATTERN_YYYYMM); |
|
|
|
|
|
|
|
if (lastExecRecord.getExecTime() == null) { |
|
|
|
// 初始化上一个季度
|
|
|
|
initQuarterDim(targetQuarter); |
|
|
|
lastExecRecord.setExecTime(new Date()); |
|
|
|
initQuarterDim(targetQMonth); |
|
|
|
lastExecRecord.setExecTime(now); |
|
|
|
lastExecRecordService.updateById(lastExecRecord); |
|
|
|
} else { |
|
|
|
// 连续初始化多个季度
|
|
|
|
startQuarter = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMM); |
|
|
|
if (initQuarterDim(startQuarter, targetQuarter)) { |
|
|
|
lastExecRecord.setExecTime(new Date()); |
|
|
|
startQMonth = DateUtils.addDateMonths(DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMM), 3); |
|
|
|
if (initQuarterDim(startQMonth, targetQMonth)) { |
|
|
|
lastExecRecord.setExecTime(now); |
|
|
|
lastExecRecordService.updateById(lastExecRecord); |
|
|
|
} |
|
|
|
} |
|
|
|