From a83d4cbfa93c0d4115b9ffbc111b9d655e15196c Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期四, 04 七月 2019 10:11:27 +0800 Subject: [PATCH] 给日期公式加单引号 --- ruleserver/ruleToformula.go | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go index 1924eea..6e0469e 100644 --- a/ruleserver/ruleToformula.go +++ b/ruleserver/ruleToformula.go @@ -307,7 +307,7 @@ completeFormula = completeFormula + va.Result } if completeFormula != "" { - log.Println("鐪嬬湅鍏紡-----------锛�", completeFormula) + log.Println("缁撴灉鍏紡-----------锛�", completeFormula) expression, _ := govaluate.NewEvaluableExpression(completeFormula) if strings.HasPrefix(completeFormula,"&&") || strings.HasPrefix(completeFormula,"||"){ panic("瑙勫垯鏈夎锛屽緱鍒扮殑鏁板鍏紡涓嶅彲瑙f瀽") @@ -781,13 +781,13 @@ } } if rule.Operator == "unsatisfy" || rule.Operator == "!="{ // 涓嶆弧瓒虫墍閫夌殑鏃堕棿瑙勫垯 - formula := timeSlot.Start + " < " + am.time + formula := "'"+timeSlot.Start + "'" + " < " + "'" + am.time + "'" log.Println("-----------------鏃堕棿瑙勫垯涓嶆弧瓒崇殑鍏紡start锛�",formula) expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡 result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋� - formula1 := timeSlot.End + " > " + am.time - log.Println("-----------------鏃堕棿瑙勫垯涓嶆弧瓒崇殑鍏紡end锛�",formula) + formula1 := "'"+timeSlot.End +"'"+ " > " +"'" + am.time+ "'" + log.Println("-----------------鏃堕棿瑙勫垯涓嶆弧瓒崇殑鍏紡end锛�",formula1) expression1, _ := govaluate.NewEvaluableExpression(formula1) // 寰楀埌鏁板鍏紡 result1, _ := expression1.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋� if result.(bool) && result1.(bool) { -- Gitblit v1.8.0