Roc 1 年之前
父节点
当前提交
c54eabbc7f
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 1
      models/base_from_calculate.go
  2. 1 0
      models/base_from_ths.go

+ 1 - 1
models/base_from_calculate.go

@@ -668,7 +668,7 @@ func Calculate(edbInfoIdArr []*EdbInfo, edbInfoId int, edbCode, formulaStr strin
 		item.EdbInfoId = v.EdbInfoId
 		item.DataMap = dataMap
 	}
-	formulaMap := services.CheckFormula(formulaStr)
+	formulaMap := utils.CheckFormula(formulaStr)
 	addSql := ` INSERT INTO edb_data_calculate(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
 	nowStr := time.Now().Format(utils.FormatDateTime)
 	var isAdd bool

+ 1 - 0
models/base_from_ths.go

@@ -3,6 +3,7 @@ package models
 import (
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
+	"hongze/hongze_edb_lib/services/alarm_msg"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"strings"