|
|
@@ -287,7 +287,8 @@ func CalculateByRuleByRuleLineNh(to orm.TxOrmer, predictEdbInfo EdbInfo, predict
|
|
|
// 获取需要预测的日期
|
|
|
startDateStr := secondDataList[lenSecondData-1].DataTime
|
|
|
startDate, _ := time.ParseInLocation(utils.FormatDate, startDateStr, time.Local)
|
|
|
- endDate, _ := time.ParseInLocation(utils.FormatDate, ruleConf.EndDate, time.Local)
|
|
|
+ //endDate, _ := time.ParseInLocation(utils.FormatDate, ruleConf.EndDate, time.Local)
|
|
|
+ endDate := rule.EndDate
|
|
|
dayList := getPredictEdbDayList(startDate, endDate, predictEdbInfo.Frequency)
|
|
|
if len(dayList) <= 0 { // 如果未来没有日期的话，那么就退出当前循环，进入下一个循环
|
|
|
return
|
