Merge branch 'bzq1/fix_conflict_lib_record' of eta_server/eta_index_lib into debug

controllers/base_from_calculate.go

@@ -349,7 +349,7 @@ func (this *CalculateController) Edit() {
 	newEdbInfoEditRecord.Unit = req.Unit
 	newEdbInfoEditRecord.OperateUserId = req.AdminId
 	newEdbInfoEditRecord.OperateUserRealName = req.AdminName
-	err = services.AddEditEdbInfoRcord(oldEdbInfo, newEdbInfoEditRecord)
+	err = services.AddEditEdbInfoRecord(oldEdbInfo, newEdbInfoEditRecord)
 	if err != nil {
 		br.Msg = "记录基础信息变更日志失败"
 		br.ErrMsg = err.Error()
@@ -809,7 +809,7 @@ func (this *CalculateController) BatchSave() {
 	newEdbInfo.Unit = req.Unit
 	newEdbInfo.OperateUserId = req.AdminId
 	newEdbInfo.OperateUserRealName = req.AdminName
-	err = services.AddEditEdbInfoRcord(edbInfo, newEdbInfo)
+	err = services.AddEditEdbInfoRecord(edbInfo, newEdbInfo)
 	if err != nil {
 		br.Msg = "保存失败"
 		br.ErrMsg = "保存失败,Err:" + err.Error()
@@ -1266,7 +1266,7 @@ func (this *CalculateController) BatchEdit() {
 	newEdbInfoRecord.Unit = req.Unit
 	newEdbInfoRecord.OperateUserId = req.AdminId
 	newEdbInfoRecord.OperateUserRealName = req.AdminName
-	err = services.AddEditEdbInfoRcord(oldEdbInfo, newEdbInfoRecord)
+	err = services.AddEditEdbInfoRecord(oldEdbInfo, newEdbInfoRecord)
 	if err != nil {
 		br.Msg = "保存失败"
 		br.ErrMsg = "记录指标操作记录失败，Err:" + err.Error()

controllers/base_from_predict_calculate.go

@@ -520,7 +520,7 @@ func editPredictCalculate(br *models.BaseResponse, req models.EdbInfoCalculateSa
 	newEdbInfoEditRecord.Unit = req.Unit
 	newEdbInfoEditRecord.OperateUserId = req.AdminId
 	newEdbInfoEditRecord.OperateUserRealName = req.AdminName
-	err = services.AddEditEdbInfoRcord(oldEdbInfo, newEdbInfoEditRecord)
+	err = services.AddEditEdbInfoRecord(oldEdbInfo, newEdbInfoEditRecord)
 	if err != nil {
 		br.Msg = "记录基础信息变更日志失败"
 		br.ErrMsg = err.Error()
@@ -704,6 +704,17 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 		return
 	}
 
+	// 记录原始指标信息
+	var oldEdbInfo *models.EdbInfo
+	if req.EdbInfoId > 0 {
+		oldEdbInfo, err = models.GetEdbInfoById(req.EdbInfoId)
+		if err != nil {
+			br.Msg = "获取指标信息失败"
+			br.ErrMsg = "获取指标信息失败:Err:" + err.Error()
+			return
+		}
+	}
+
 	// 来源预测指标信息
 	var fromEdbInfo *models.EdbInfo
 	if fromEdbInfoId > 0 {
@@ -893,12 +904,6 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 	}
 
 	if req.EdbInfoId > 0 {
-		oldEdbInfo, err := models.GetEdbInfoById(req.EdbInfoId)
-		if err != nil {
-			br.Msg = "获取指标信息失败"
-			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
-			return
-		}
 		// 记录操作变更记录
 		newEdbInfo := new(models.EdbInfoEditRecord)
 		newEdbInfo.EdbName = req.EdbName
@@ -906,7 +911,7 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 		newEdbInfo.Unit = req.Unit
 		newEdbInfo.OperateUserId = req.AdminId
 		newEdbInfo.OperateUserRealName = req.AdminName
-		err = services.AddEditEdbInfoRcord(oldEdbInfo, newEdbInfo)
+		err = services.AddEditEdbInfoRecord(oldEdbInfo, newEdbInfo)
 		if err != nil {
 			br.Msg = "保存失败"
 			br.ErrMsg = "保存失败,Err:" + err.Error()

models/edb_info_record.go

@@ -21,7 +21,7 @@ type EdbInfoRecord struct {
 	Timestamp           int64     `description:"时间戳"`
 }
 
-func AddEditEdbInfoRcord(edbRecord *EdbInfoRecord) (e error) {
+func AddEditEdbInfoRecord(edbRecord *EdbInfoRecord) (e error) {
 	o := orm.NewOrm()
 	_, e = o.Insert(edbRecord)
 	return

services/base_from_calculate.go

@@ -470,7 +470,7 @@ func EdbCalculateBatchSave(req models.EdbInfoCalculateBatchSaveReq, lang string)
 	newEdbInfoEditRecord.Unit = req.Unit
 	newEdbInfoEditRecord.OperateUserId = req.AdminId
 	newEdbInfoEditRecord.OperateUserRealName = req.AdminName
-	err = AddEditEdbInfoRcord(oldEdbInfo, newEdbInfoEditRecord)
+	err = AddEditEdbInfoRecord(oldEdbInfo, newEdbInfoEditRecord)
 	if err != nil {
 		errMsg = "记录基础信息操作变更日志失败，Err:" + err.Error()
 		err = fmt.Errorf("操作记录保存失败")
@@ -900,7 +900,7 @@ func EdbCalculateBatchEdit(req models.EdbInfoCalculateBatchEditReq) (edbInfo *mo
 	newEdbInfoEditRecord.Unit = req.Unit
 	newEdbInfoEditRecord.OperateUserId = req.AdminId
 	newEdbInfoEditRecord.OperateUserRealName = req.AdminName
-	err = AddEditEdbInfoRcord(oldEdbInfo, newEdbInfoEditRecord)
+	err = AddEditEdbInfoRecord(oldEdbInfo, newEdbInfoEditRecord)
 	if err != nil {
 		errMsg = "记录基础信息操作变更日志失败，Err:" + err.Error()
 		err = fmt.Errorf("操作记录保存失败")

services/edb_info_record.go

@@ -5,7 +5,7 @@ import (
 	"time"
 )
 
-func AddEditEdbInfoRcord(oldEdbInfo *models.EdbInfo, newEdbInfo *models.EdbInfoEditRecord) (err error) {
+func AddEditEdbInfoRecord(oldEdbInfo *models.EdbInfo, newEdbInfo *models.EdbInfoEditRecord) (err error) {
 	if oldEdbInfo.EdbName != newEdbInfo.EdbName || oldEdbInfo.Frequency != newEdbInfo.Frequency || oldEdbInfo.Unit != newEdbInfo.Unit {
 		edbRecord := new(models.EdbInfoRecord)
 		edbRecord.EdbInfoId = oldEdbInfo.EdbInfoId
@@ -20,7 +20,7 @@ func AddEditEdbInfoRcord(oldEdbInfo *models.EdbInfo, newEdbInfo *models.EdbInfoE
 		ctime := time.Now()
 		edbRecord.CreateTime = ctime
 		edbRecord.Timestamp = ctime.Unix()
-		err = models.AddEditEdbInfoRcord(edbRecord)
+		err = models.AddEditEdbInfoRecord(edbRecord)
 		if err != nil {
 			return
 		}