累计值拼接

models/predict_edb_data_calculate_ljztbpj.go

@@ -375,12 +375,8 @@ func refreshAllPredictCalculateLjztbpj(to orm.TxOrmer, edbInfo, firstEdbInfo, se
 	if err != nil {
 		return
 	}
+	latestDateStr = secondEdbInfo.LatestDate
 
-	if firstEdbInfo.LatestDate <= secondEdbInfo.LatestDate {
-		latestDateStr = firstEdbInfo.LatestDate
-	} else {
-		latestDateStr = secondEdbInfo.LatestDate
-	}
 	//待拼接指标map
 	pjDataMap := make(map[string]float64)     //需要入库的数据
 	nowEdbDataMap := make(map[string]float64) //当前指标的数据（已经在库里了，不需要重新）
@@ -501,9 +497,6 @@ func refreshAllPredictCalculateLjztbpj(to orm.TxOrmer, edbInfo, firstEdbInfo, se
 				tbzDataValue := tbzEdbDataMap[v] //同比值
 				currValue := lastYearEdbDataValue * (1 + tbzDataValue/100)
 				currValue, _ = decimal.NewFromFloat(currValue).Truncate(4).Float64() //保留4位小数
-				if latestDateStr == pjDataTime.Format(utils.FormatDate) {
-					latestValue = currValue
-				}
 				//如果计算出来的值与库里面的值不匹配，那么就去修改该值
 				if nowEdbDataValue != currValue {
 					//将计算后的数据存入待拼接指标map里面，以便后续计算
@@ -551,9 +544,6 @@ func refreshAllPredictCalculateLjztbpj(to orm.TxOrmer, edbInfo, firstEdbInfo, se
 					DataTimestamp: timestamp,
 				}
 				addDataList = append(addDataList, edbDataLjztbpj)
-				if latestDateStr == dataTime {
-					latestValue = dataValue
-				}
 			}
 		}
 
@@ -594,15 +584,12 @@ func refreshAllPredictCalculateLjztbpj(to orm.TxOrmer, edbInfo, firstEdbInfo, se
 				err = errors.New("更新现有的累计值同比拼接指标数据失败,Err:" + err.Error())
 				return
 			}
-			if latestDateStr == edbDate {
-				latestValue = edbDataValue
-			}
 		}
 	}
 
 	//确定最终值
 	var finalLast EdbInfoSearchData
-	sql = ` SELECT max(data_time) as data_time , value FROM edb_data_predict_calculate_ljztbpj WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
+	sql = ` SELECT data_time , value FROM edb_data_predict_calculate_ljztbpj WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
 	tmpErr := to.Raw(sql, edbInfo.EdbInfoId, latestDateStr).QueryRow(&finalLast)
 	if tmpErr != nil {
 		if tmpErr.Error() != utils.ErrNoRow() {
@@ -610,10 +597,8 @@ func refreshAllPredictCalculateLjztbpj(to orm.TxOrmer, edbInfo, firstEdbInfo, se
 		}
 		return
 	}else{
-		if finalLast.DataTime != latestDateStr {
-			latestDateStr = finalLast.DataTime
-			latestValue = finalLast.Value
-		}
+		latestDateStr = finalLast.DataTime
+		latestValue = finalLast.Value
 	}
 	return
 }

models/predict_edb_data_calculate_nhcc.go

@@ -556,9 +556,6 @@ func refreshAllPredictCalculateNhcc(to orm.TxOrmer, edbInfo, firstEdbInfo, secon
 		b2Decimal := decimal.NewFromFloat(b2Val)
 
 		val, _ := bDecimal.Sub(b2Decimal).RoundCeil(4).Float64()
-		if latestDateStr == currDate {
-			latestValue = val
-		}
 		// 判断之前有没有该数据
 		existData, ok := dataMap[currDate]
 		if !ok { //不存在那么就添加吧
@@ -633,7 +630,7 @@ func refreshAllPredictCalculateNhcc(to orm.TxOrmer, edbInfo, firstEdbInfo, secon
 
 	//确定最终值
 	var finalLast EdbInfoSearchData
-	sql = ` SELECT max(data_time) as data_time , value FROM edb_data_predict_calculate_nhcc WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
+	sql = ` SELECT data_time , value FROM edb_data_predict_calculate_nhcc WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
 	tmpErr := to.Raw(sql, edbInfo.EdbInfoId, latestDateStr).QueryRow(&finalLast)
 	if tmpErr != nil {
 		if tmpErr.Error() != utils.ErrNoRow() {
@@ -641,10 +638,8 @@ func refreshAllPredictCalculateNhcc(to orm.TxOrmer, edbInfo, firstEdbInfo, secon
 		}
 		return
 	}else{
-		if finalLast.DataTime != latestDateStr {
-			latestDateStr = finalLast.DataTime
-			latestValue = finalLast.Value
-		}
+		latestDateStr = finalLast.DataTime
+		latestValue = finalLast.Value
 	}
 	return
 }