预测指标直接拼接，最新实际日期修改

models/predict_edb_data_calculate_zjpj.go

@@ -344,6 +344,15 @@ func refreshAllPredictCalculateZjpj(to orm.TxOrmer, edbInfo, firstEdbInfo, secon
 	if err != nil {
 		return
 	}
+	if edbInfo.CalculateFormula <= secondEdbInfo.LatestDate {
+		latestDateStr = secondEdbInfo.LatestDate
+	}else{
+		if edbInfo.CalculateFormula >= firstEdbInfo.LatestDate {
+			latestDateStr = firstEdbInfo.LatestDate
+		}else {
+			latestDateStr = edbInfo.CalculateFormula
+		}
+	}
 	var dateArr []string
 	dataMap := make(map[string]*EdbDataPredictCalculateZjpj)
 	removeDataTimeMap := make(map[string]int) //需要移除的日期数据
@@ -361,7 +370,7 @@ func refreshAllPredictCalculateZjpj(to orm.TxOrmer, edbInfo, firstEdbInfo, secon
 		if err != nil {
 			return
 		}
-		latestDateStr = firstEdbInfo.LatestDate
+
 		for _, v := range firstDataList {
 			if v.DataTime >= edbInfo.CalculateFormula {
 				continue
@@ -370,7 +379,7 @@ func refreshAllPredictCalculateZjpj(to orm.TxOrmer, edbInfo, firstEdbInfo, secon
 			if _, ok := removeDataTimeMap[v.DataTime]; ok {
 				delete(removeDataTimeMap, v.DataTime)
 			}
-			if firstEdbInfo.LatestDate == v.DataTime {
+			if latestDateStr == v.DataTime {
 				latestValue = v.Value
 			}
 			//时间戳
@@ -423,7 +432,7 @@ func refreshAllPredictCalculateZjpj(to orm.TxOrmer, edbInfo, firstEdbInfo, secon
 			if _, ok := removeDataTimeMap[v.DataTime]; ok {
 				delete(removeDataTimeMap, v.DataTime)
 			}
-			if firstEdbInfo.LatestDate == v.DataTime {
+			if latestDateStr == v.DataTime {
 				latestValue = v.Value
 			}
 			if edbData, ok := dataMap[v.DataTime]; ok {