Merge branch 'edb_data/fix_calculate'

models/data_manage/edb_data_calculate.go

@@ -30,10 +30,10 @@ func AddEdbDataCalculateBySql(sqlStr string) (err error) {
 }
 
 // DeleteEdbDataCalculateBySql 根据删除sql删除指标数据
-func DeleteEdbDataCalculateBySql(deleteStr string) (err error) {
+func DeleteEdbDataCalculateBySql(deleteStr string, edbInfoId int) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	_, err = o.Raw(deleteStr).Exec()
+	_, err = o.Raw(deleteStr, edbInfoId).Exec()
 	return
 }
 

services/data/data_calculate.go

@@ -122,7 +122,7 @@ func RefreshCalculate(edbInfoIdArr []*data_manage.EdbInfo, edbInfoId int, edbCod
 		removeDateStr = `"` + removeDateStr + `"`
 		//如果拼接指标变更了，那么需要删除所有的指标数据
 		sql := fmt.Sprintf(` DELETE FROM edb_data_calculate WHERE edb_info_id = ? and data_time in (%s) `, removeDateStr)
-		err = data_manage.DeleteEdbDataCalculateBySql(sql)
+		err = data_manage.DeleteEdbDataCalculateBySql(sql, edbInfoId)
 		if err != nil {
 			err = fmt.Errorf("删除计算失败的计算指标数据失败,Err:" + err.Error())
 			return