temp commit

controllers/data_manage/edb_info_calculate.go

@@ -411,10 +411,12 @@ func (this *ChartInfoController) CalculateEdit() {
 func (this *ChartInfoController) CalculateBatchSave() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-
 	sysUser := this.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
@@ -503,6 +505,20 @@ func (this *ChartInfoController) CalculateBatchSave() {
 			br.Msg = "日期间隔不得少于两天"
 			return
 		}
+	case utils.DATA_SOURCE_CALCULATE_ZSXY: // 指数修匀
+		if req.Formula == "" {
+			br.Msg = "请填写alpha值"
+			return
+		}
+		alpha, e := strconv.ParseFloat(req.Formula, 64)
+		if e != nil {
+			br.Msg = "alpha值输入错误, 请重新输入"
+			return
+		}
+		if alpha <= 0 || alpha >= 1 {
+			br.Msg = "alpha值输入错误, 请重新输入"
+			return
+		}
 	}
 
 	notNeedFromEdbSourceList := []int{utils.DATA_SOURCE_CALCULATE_KSZS} // 不需要传入来源指标id的 指标类型
@@ -1610,6 +1626,20 @@ func (this *ChartInfoController) BatchCalculateBatchSave() {
 				})
 				continue
 			}
+		case utils.DATA_SOURCE_CALCULATE_ZSXY: // 指数修匀
+			if req.Formula == "" {
+				br.Msg = "请填写alpha值"
+				return
+			}
+			alpha, e := strconv.ParseFloat(req.Formula, 64)
+			if e != nil {
+				br.Msg = "alpha值输入错误, 请重新输入"
+				return
+			}
+			if alpha <= 0 || alpha >= 1 {
+				br.Msg = "alpha值输入错误, 请重新输入"
+				return
+			}
 		}
 
 		if fromEdbInfoId <= 0 {

utils/constants.go

@@ -157,6 +157,7 @@ const (
 	DATA_SOURCE_PREDICT_CALCULATE_STANDARD_DEVIATION            //预测标准差->69
 	DATA_SOURCE_PREDICT_CALCULATE_PERCENTILE                    //预测百分位->70
 	DATA_SOURCE_FUBAO                                = 71       //富宝->71
+	DATA_SOURCE_CALCULATE_ZSXY                       = 72       // 指数修匀->72
 )
 
 // 数据刷新频率