多指标求和求平均

models/common.go

@@ -54,6 +54,10 @@ func GetBaseEdbInfoModel(source int) (baseEdbInfoModel BaseEdbInfoInterface) {
 		baseEdbInfoModel = ExponentialSmoothing{}
 	case utils.DATA_SOURCE_CALCULATE_ZDYFX:
 		baseEdbInfoModel = CustomAnalysis{}
+	case utils.DATA_SOURCE_CALCULATE_SUM:
+		baseEdbInfoModel = CalculateSum{}
+	case utils.DATA_SOURCE_CALCULATE_AVG:
+		baseEdbInfoModel = CustomAnalysis{}
 	default:
 
 	}

models/edb_data_calculate_sum.go

@@ -102,7 +102,9 @@ func (obj CalculateSum) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, e
 	return
 }
 
-func (obj CalculateSum) Edit(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq) (err error) {
+func (obj CalculateSum) Edit(params EditCalculateBatchParams) (err error, errMsg string) {
+	req := params.Req
+	edbInfo := params.EdbInfo
 	o := orm.NewOrm()
 	to, err := o.Begin()
 	if err != nil {
@@ -187,7 +189,8 @@ func (obj CalculateSum) Edit(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq
 	return
 }
 
-func (obj CalculateSum) Refresh(edbInfo *EdbInfo) (err error) {
+func (obj CalculateSum) Refresh(params RefreshParams) (err error, errMsg string) {
+	edbInfo := params.EdbInfo
 	edbInfoCalculateDetailList, err := GetEdbInfoCalculateDetailList(edbInfo.EdbInfoId)
 	if err != nil {
 		return
@@ -220,6 +223,8 @@ func (obj CalculateSum) Refresh(edbInfo *EdbInfo) (err error) {
 }
 
 func (obj CalculateSum) refresh(to orm.TxOrmer, edbInfoId, source, subSource int, edbInfoIdArr []*EdbInfo, edbCode, extra string, edbInfoTag map[string]int, emptyType int) (err error) {
+
+	//to orm.TxOrmer, edbInfoId, source, subSource int, edbInfoIdArr []*EdbInfo, edbCode, extra string, edbInfoTag map[string]int, emptyType int
 	realSaveDataMap := make(map[string]map[int]float64)
 	saveDataMap := make(map[string]map[int]float64)
 

services/base_from_calculate.go

@@ -110,7 +110,7 @@ func EdbCalculateBatchSave(req models.EdbInfoCalculateBatchSaveReq) (uniqueCode
 		}
 	}
 
-	notNeedFromEdbSourceList := []int{utils.DATA_SOURCE_CALCULATE_KSZS, utils.DATA_SOURCE_CALCULATE_CORRELATION, utils.DATA_SOURCE_CALCULATE_ZDYFX} // 不需要传入来源指标id的 指标类型
+	notNeedFromEdbSourceList := []int{utils.DATA_SOURCE_CALCULATE_KSZS, utils.DATA_SOURCE_CALCULATE_CORRELATION, utils.DATA_SOURCE_CALCULATE_ZDYFX, utils.DATA_SOURCE_CALCULATE_SUM, utils.DATA_SOURCE_CALCULATE_AVG} // 不需要传入来源指标id的 指标类型
 	if fromEdbInfoId <= 0 && !utils.InArrayByInt(notNeedFromEdbSourceList, req.Source) {
 		err = fmt.Errorf("请选择指标")
 		return