Merge branch 'feature/pool253_edb_relation' of eta_server/eta_index_lib into master

logic/predict_edb.go

@@ -244,8 +244,8 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 						calculateMappingItem := &models.EdbInfoCalculateMapping{
 							EdbInfoCalculateMappingId: 0,
 							EdbInfoId:                 0,
-							Source:                    utils.DATA_SOURCE_CALCULATE,
-							SourceName:                "指标运算",
+							Source:                    edbInfo.Source,
+							SourceName:                edbInfo.SourceName,
 							EdbCode:                   "",
 							FromEdbInfoId:             fromEdbInfo.EdbInfoId,
 							FromEdbCode:               fromEdbInfo.EdbCode,
@@ -336,8 +336,8 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 						tmpCalculateMappingItem := &models.EdbInfoCalculateMapping{
 							EdbInfoCalculateMappingId: 0,
 							EdbInfoId:                 0,
-							Source:                    utils.DATA_SOURCE_CALCULATE,
-							SourceName:                "指标运算",
+							Source:                    edbInfo.Source,
+							SourceName:                edbInfo.SourceName,
 							EdbCode:                   "",
 							FromEdbInfoId:             fromEdbInfo.EdbInfoId,
 							FromEdbCode:               fromEdbInfo.EdbCode,

models/edb_info_relation.go

@@ -97,8 +97,8 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 
 	if len(refreshEdbInfoIds) > 0 {
 		// todo 更新指标的刷新状态
-		sql = ` UPDATE edb_info SET no_update = 0 WHERE  edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) AND no_update = 1`
-		_, err = o.Raw(sql, refreshEdbInfoIds).Exec()
+		sql = ` UPDATE edb_info SET no_update = 0, set_update_time=? WHERE  edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) AND no_update = 1`
+		_, err = o.Raw(sql, time.Now(), refreshEdbInfoIds).Exec()
 		if err != nil {
 			return
 		}