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 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c11831f..6e0469e 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -781,12 +781,12 @@
 					}
 				}
 				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
+					formula1 := "'"+timeSlot.End +"'"+ " > " +"'" + am.time+ "'"
 					log.Println("-----------------鏃堕棿瑙勫垯涓嶆弧瓒崇殑鍏紡end锛�",formula1)
 					expression1, _ := govaluate.NewEvaluableExpression(formula1) // 寰楀埌鏁板鍏紡
 					result1, _ := expression1.Evaluate(nil)                      // 寰楀埌鏁板鍏紡鐨勭粨鏋�

--
Gitblit v1.8.0