浏览代码

Merge branch 'feature/eta1.2.2_day_val' into debug

xyxie 1 年之前
父节点
当前提交
87300af30d
共有 1 个文件被更改,包括 12 次插入0 次删除
  1. 12 0
      controllers/base_from_calculate.go

+ 12 - 0
controllers/base_from_calculate.go

@@ -1239,6 +1239,18 @@ func (this *CalculateController) BatchEdit() {
 		sourName = utils.DATA_SOURCE_NAME_CALCULATE_CORRELATION
 		err, errMsg = models.EditCalculateCorrelation(edbInfo, &req)
 	case utils.DATA_SOURCE_CALCULATE_RJZ:
+		if req.Frequency == "日度" {
+			br.Msg = "日度指标无需进行日均值计算"
+			return
+		}
+		if req.Frequency != fromEdbInfo.Frequency {
+			br.Msg = "当前频度和原指标频度不一致"
+			return
+		}
+		if req.Unit != fromEdbInfo.Unit {
+			br.Msg = "单位只允许为和原指标频度保持一致,禁止选择其他单位"
+			return
+		}
 		sourName = "日均值"
 		err = models.EditCalculateRjz(edbInfo, &req, fromEdbInfo)
 	default: