公式按照顺序排列

models/base_from_calculate.go

@@ -396,7 +396,7 @@ func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoId, sou
 		formulaMap := make(map[string]string)
 		formulaStr = ""
 		for _, fv := range formulaDateSlice {
-			if sk <= fv {
+			if sk < fv {
 				if f, ok := formulaDateMap[fv]; ok {
 					formulaStr = f
 					formulaMap = utils.CheckFormula(formulaStr)

models/base_predict_from_calculate.go

@@ -375,7 +375,7 @@ func refreshAllPredictCalculate(to orm.TxOrmer, edbInfoIdList []*EdbInfo, edbInf
 		formulaMap := make(map[string]string)
 		formulaStr = ""
 		for _, fv := range formulaDateSlice {
-			if sk >= fv {
+			if sk < fv {
 				if f, ok := formulaDateMap[fv]; ok {
 					formulaStr = f
 					formulaMap = utils.CheckFormula(formulaStr)

models/predict_edb.go

@@ -150,7 +150,7 @@ func CalculateByRuleBy9(to orm.TxOrmer, rule CalculateRule) (resultDataList []*E
 		formulaMap := make(map[string]string)
 		formulaStr = ""
 		for _, fv := range formulaDateSlice {
-			if sk >= fv {
+			if sk < fv {
 				if f, ok := formulaDateMap[fv]; ok {
 					formulaStr = f
 					formulaMap = utils.CheckFormula(formulaStr)

services/base_from_predict.go

@@ -168,7 +168,7 @@ func CalculateByRuleByNine(formulaStr string, edbInfoList []*models.EdbInfo, edb
 		formulaMap := make(map[string]string)
 		formulaStr = ""
 		for _, fv := range formulaDateSlice {
-			if date >= fv {
+			if date < fv {
 				if f, ok := formulaDateMap[fv]; ok {
 					formulaStr = f
 					formulaMap = utils.CheckFormula(formulaStr)