Merge branch 'feature/pool151_predict_calculate' into debug

# Conflicts:
#	utils/constants.go

models/predict_edb_data_calculate_bp.go

@@ -76,6 +76,8 @@ func SavePredictCalculateBp(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbI
 		if err != nil {
 			return
 		}
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		//修改指标信息
 		edbInfo.EdbName = req.EdbName
 		edbInfo.EdbNameSource = req.EdbName

models/predict_edb_data_calculate_cjjx.go

@@ -85,7 +85,8 @@ func SavePredictCalculateCjjx(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *Ed
 		if err != nil {
 			return
 		}
-
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		//修改指标信息
 		edbInfo.EdbName = req.EdbName
 		edbInfo.EdbNameSource = req.EdbName

models/predict_edb_data_calculate_hbz.go

@@ -76,6 +76,8 @@ func SavePredictCalculateHbz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *Edb
 		if err != nil {
 			return
 		}
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		oldCalculateFormula := edbInfo.CalculateFormula
 		dataTableName := GetEdbDataTableName(utils.DATA_SOURCE_PREDICT_CALCULATE_HBZ)
 		//修改指标信息

models/predict_edb_data_calculate_hcz.go

@@ -77,6 +77,8 @@ func SavePredictCalculateHcz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *Edb
 		if err != nil {
 			return
 		}
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		oldCalculateFormula := edbInfo.CalculateFormula
 		//修改指标信息
 		edbInfo.EdbName = req.EdbName

models/predict_edb_data_calculate_ljztbpj.go

@@ -158,6 +158,8 @@ func SavePredictCalculateLjztbpj(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo
 		if err != nil {
 			return
 		}
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		nowEdbInfo := *edbInfo // 现在的指标信息
 
 		sql := ``

models/predict_edb_data_calculate_ljzzy.go

@@ -78,6 +78,8 @@ func SavePredictCalculateLjzzy(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *E
 		if err != nil {
 			return
 		}
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		//修改指标信息
 		edbInfo.EdbName = req.EdbName
 		edbInfo.EdbNameSource = req.EdbName

models/predict_edb_data_calculate_nhcc.go

@@ -125,6 +125,8 @@ func SavePredictCalculateNhcc(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, s
 		if err != nil {
 			return
 		}
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		nowEdbInfo := *edbInfo // 现在的指标信息
 
 		//修改指标信息

models/predict_edb_data_calculate_nszydbpjjs.go

@@ -112,6 +112,8 @@ func SavePredictCalculateNszydpjjs(reqEdbInfoId, classifyId int, edbName, freque
 			err = errors.New(errMsg)
 			return
 		}
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		oldCalculateFormula := edbInfo.CalculateFormula //原先的n值
 
 		edbInfo.EdbName = edbName

models/predict_edb_data_calculate_tbz.go

@@ -105,7 +105,8 @@ func SavePredictCalculateTbz(reqEdbInfoId, classifyId int, edbName, frequency, u
 			err = errors.New(errMsg)
 			return
 		}
-
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		//修改指标信息
 		edbInfo.EdbName = edbName
 		edbInfo.EdbNameSource = edbName

models/predict_edb_data_calculate_tcz.go

@@ -105,7 +105,8 @@ func SavePredictCalculateTcz(reqEdbInfoId, classifyId int, edbName, frequency, u
 			err = errors.New(errMsg)
 			return
 		}
-
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		//修改指标信息
 		edbInfo.EdbName = edbName
 		edbInfo.EdbNameSource = edbName

models/predict_edb_data_calculate_time_shift.go

@@ -79,6 +79,8 @@ func SavePredictCalculateTimeShift(req *EdbInfoCalculateBatchSaveReq, fromEdbInf
 		if err != nil {
 			return
 		}
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
 		oldEdbInfo := *edbInfo //旧的指标信息
 
 		//修改指标信息

models/predict_edb_data_calculate_zjpj.go

@@ -122,6 +122,9 @@ func SavePredictCalculateZjpj(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, s
 		if err != nil {
 			return
 		}
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
+
 		nowEdbInfo := *edbInfo // 现在的指标信息
 
 		//修改指标信息