Merge branch 'bzq1/excel_rule_master' of eta_server/eta_api into debug

services/excel/lucky_sheet_table.go

@@ -152,7 +152,7 @@ func getCellValueByType(value string, valueType int, tableDataList [][]LuckyShee
 		if len(coordIntArr) == 2 {
 			x, y := coordIntArr[0]-1, coordIntArr[1]-1
 			conditionValue, err := strconv.ParseFloat(tableDataList[x][y].Monitor, 64)
-			if err == nil {
+			if err != nil {
 				return 0, false
 			}
 			return conditionValue, true
@@ -228,7 +228,7 @@ func checkCellRule(ruleInfo *excel.ExcelInfoRuleMappingView, value string, table
 	case 5:
 		// 发生日期
 		var dateStart, dataEnd time.Time
-		switch value {
+		switch ruleInfo.LeftValueBack {
 		// 今天
 		case "today":
 			// 获得今天的零点零分零秒