手工数据修改回撤

controllers/base_from_manual.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"eta/eta_index_lib/logic"
 	"eta/eta_index_lib/models"
-	"eta/eta_index_lib/services"
 	"eta/eta_index_lib/utils"
 	"strconv"
 	"time"
@@ -43,7 +42,7 @@ func (this *ManualController) Add() {
 	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
-		err = services.AddEdbDataFromManual(req.EdbCode)
+		err = models.AddEdbDataFromManual(req.EdbCode)
 		if err != nil {
 			br.Msg = "获取指标信息失败！"
 			br.ErrMsg = "获取指标信息失败 AddEdbDataFromManual，Err:" + err.Error()
@@ -110,7 +109,7 @@ func (this *ManualController) Refresh() {
 	}
 
 	req.StartDate = `` // 开始日期也给过滤吧，万一研究员补充了之前的数据呢，还是过滤掉吧
-	err = services.RefreshEdbDataFromManual(req, edbInfo)
+	err = models.RefreshEdbDataFromManual(req.EdbInfoId, req.EdbCode, req.StartDate)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "刷新指标信息失败！"
 		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromManual，Err:" + err.Error()

models/base_from_manual.go

@@ -31,10 +31,10 @@ func GetEdbdataManualByCondition(condition string, pars []interface{}) (item []*
 }
 
 // AddEdbDataFromManual 新增弘则手工指标数据
-func AddEdbDataFromManual(edbCode string, manualDataList []*ManualEdbdata) (err error) {
+func AddEdbDataFromManual(edbCode string) (err error) {
 	o := orm.NewOrm()
 
-	/*var condition string
+	var condition string
 	var pars []interface{}
 
 	if edbCode != "" {
@@ -45,7 +45,7 @@ func AddEdbDataFromManual(edbCode string, manualDataList []*ManualEdbdata) (err
 	manualDataList, err := GetEdbdataManualByCondition(condition, pars)
 	if err != nil {
 		return
-	}*/
+	}
 	dataLen := len(manualDataList)
 
 	if dataLen > 0 {
@@ -82,7 +82,7 @@ func AddEdbDataFromManual(edbCode string, manualDataList []*ManualEdbdata) (err
 }
 
 // RefreshEdbDataFromManual 刷新手工指标数据
-func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string, manualDataList []*ManualEdbdata) (err error) {
+func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_MANUAL
 	o := orm.NewOrm()
 	if err != nil {
@@ -90,7 +90,7 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string, manualDa
 	}
 	edbInfoIdStr := strconv.Itoa(edbInfoId)
 	//计算数据
-	/*var condition string
+	var condition string
 	var pars []interface{}
 
 	if edbCode != "" {
@@ -109,7 +109,7 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string, manualDa
 	manualDataList, err := GetEdbdataManualByCondition(condition, pars)
 	if err != nil {
 		return
-	}*/
+	}
 
 	// 真实数据的最大日期  ， 插入规则配置的日期
 	var realDataMaxDate, edbDataInsertConfigDate time.Time