Merge branch 'chart/14.8' into debug

models/edb_data_calculate_ljznczj.go

@@ -27,17 +27,12 @@ func (obj LjzNczj) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, err er
 		return
 	}
 
-	frequencyInt := utils.CheckFrequency(fromEdbInfo.Frequency, req.Frequency)
-	if frequencyInt < 0 {
-		errMsg = "频度异常，不允许低频转为高频"
-		err = errors.New(errMsg)
-		return
-	}
-	if frequencyInt == 0 {
-		errMsg = "频度异常，不允许同频计算累计值年初至今"
+	if fromEdbInfo.Frequency != req.Frequency {
+		errMsg = "生成指标频度与原指标频度不同"
 		err = errors.New(errMsg)
 		return
 	}
+
 	o := orm.NewOrm()
 	to, err := o.Begin()
 	if err != nil {
@@ -133,14 +128,9 @@ func (obj LjzNczj) Edit(params EditCalculateBatchParams) (err error, errMsg stri
 		err = errors.New(errMsg)
 		return
 	}
-	frequencyInt := utils.CheckFrequency(fromEdbInfo.Frequency, req.Frequency)
-	if frequencyInt < 0 {
-		errMsg = "频度异常，不允许低频转为高频"
-		err = errors.New(errMsg)
-		return
-	}
-	if frequencyInt == 0 {
-		errMsg = "频度异常，不允许同频计算累计值年初至今"
+
+	if fromEdbInfo.Frequency != req.Frequency {
+		errMsg = "生成指标频度与原指标频度不同"
 		err = errors.New(errMsg)
 		return
 	}

models/predict_edb_data_calculate_ljz.go

@@ -600,11 +600,11 @@ func (obj PredictLjz) refresh(to orm.TxOrmer, edbInfoId, source int, edbInfo, fr
 			return
 		}
 	}
-	//确定实际数据的最终值
+	// 确定实际数据的最终值
 	{
 		var finalLast EdbInfoSearchData
 		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
-		err = to.Raw(sql, edbInfoId, latestDateStr).QueryRow(&finalLast)
+		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).QueryRow(&finalLast)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			return
 		} else {

models/predict_edb_data_calculate_ljznczj.go

@@ -26,18 +26,12 @@ func (obj PredictLjzNczj) Add(params BatchSaveCalculateBatchParams) (edbInfo *Ed
 		err = errors.New(errMsg)
 		return
 	}
-
-	frequencyInt := utils.CheckFrequency(fromEdbInfo.Frequency, req.Frequency)
-	if frequencyInt < 0 {
-		errMsg = "频度异常，不允许低频转为高频"
-		err = errors.New(errMsg)
-		return
-	}
-	if frequencyInt == 0 {
-		errMsg = "频度异常，不允许同频计算预测累计值年初至今"
+	if fromEdbInfo.Frequency != req.Frequency {
+		errMsg = "生成指标频度与原指标频度不同"
 		err = errors.New(errMsg)
 		return
 	}
+
 	o := orm.NewOrm()
 	to, err := o.Begin()
 	if err != nil {
@@ -133,14 +127,9 @@ func (obj PredictLjzNczj) Edit(params BatchSaveCalculateBatchParams) (latestDate
 		err = errors.New(errMsg)
 		return
 	}
-	frequencyInt := utils.CheckFrequency(fromEdbInfo.Frequency, req.Frequency)
-	if frequencyInt < 0 {
-		errMsg = "频度异常，不允许低频转为高频"
-		err = errors.New(errMsg)
-		return
-	}
-	if frequencyInt == 0 {
-		errMsg = "频度异常，不允许同频计算预测累计值年初至今"
+
+	if fromEdbInfo.Frequency != req.Frequency {
+		errMsg = "生成指标频度与原指标频度不同"
 		err = errors.New(errMsg)
 		return
 	}
@@ -464,7 +453,7 @@ func (obj PredictLjzNczj) refresh(to orm.TxOrmer, edbInfoId, source int, edbInfo
 	{
 		var finalLast EdbInfoSearchData
 		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
-		err = to.Raw(sql, edbInfoId, latestDateStr).QueryRow(&finalLast)
+		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).QueryRow(&finalLast)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			return
 		} else {

models/predict_edb_data_calculate_ljzzj.go

@@ -375,7 +375,7 @@ func (obj PredictLjzzj) refresh(to orm.TxOrmer, edbInfoId, source int, fromEdbIn
 	{
 		var finalLast EdbInfoSearchData
 		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
-		err = to.Raw(sql, edbInfoId, latestDateStr).QueryRow(&finalLast)
+		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).QueryRow(&finalLast)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			return
 		} else {