fix:计算指标，刷新指标时，新增移除公示异常指标

models/base_from_calculate.go

@@ -38,7 +38,7 @@ func AddCalculate(edbInfoIdArr []*EdbInfo, edbInfoId int, edbCode, formulaStr st
 	o := orm.NewOrm()
 	defer func() {
 		if err != nil {
-			utils.FileLog.Info("Calculate Err:%s" + err.Error())
+			utils.FileLog.Info(fmt.Sprintf("Calculate Err:%s" + err.Error()))
 		}
 	}()
 	saveDataMap := make(map[string]map[int]float64)
@@ -99,8 +99,7 @@ func AddCalculate(edbInfoIdArr []*EdbInfo, edbInfoId int, edbCode, formulaStr st
 				timeStr := fmt.Sprintf("%d", timestamp)
 				addSql += "("
 				addSql += strconv.Itoa(edbInfoId) + "," + "'" + edbCode + "'" + "," + "'" + sk + "'" + "," + utils.SubFloatToString(calVal, 4) + "," + "'" + nowStr + "'" +
-					"," + "'" + nowStr + "'" + "," + "1"
-				addSql += "," + "'" + timeStr + "'"
+					"," + "'" + nowStr + "'" + "," + "'" + timeStr + "'"
 				addSql += "),"
 				isAdd = true
 			}
@@ -198,7 +197,7 @@ func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoId, source int, edbCode
 		formulaStr = strings.ToUpper(formulaStr)
 		formulaFormStr := ReplaceFormula(edbInfoIdArr, sv, formulaMap, formulaStr, edbInfoIdBytes)
 		if formulaFormStr != "" {
-			utils.FileLog.Info("formulaFormStr:%s", formulaFormStr)
+			utils.FileLog.Info(fmt.Sprintf("formulaFormStr:%s", formulaFormStr))
 			expression := formula.NewExpression(formulaFormStr)
 			calResult, err := expression.Evaluate()
 			if err != nil {
@@ -239,6 +238,10 @@ func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoId, source int, edbCode
 					}
 				}
 			}
+		} else {
+			//计算公式异常，那么就移除该指标
+			removeDateList = append(removeDateList, sk)
+			continue
 		}
 	}
 

models/db.go

@@ -34,5 +34,7 @@ func init() {
 	orm.RegisterModel(
 		new(EdbDataCalculateZjpj),
 		new(EdbDataCalculateLjztbpj),
+		new(EdbInfo),
+		new(EdbInfoCalculateMapping),
 	)
 }