Merge branch 'bzq/excel_rule_master' of eta_server/eta_chart_lib into debug

models/excel_info_rule_mapping.go

@@ -29,12 +29,12 @@ type ExcelInfoRuleMapping struct {
 type ExcelInfoRuleMappingView struct {
 	ExcelInfoRuleMappingId int    `orm:"pk" description:"主键"`
 	ExcelInfoId            int    `description:"Excel信息ID"`
-	RuleType               int    `description:"规则类型"`
+	RuleType               int    `description:"规则类型：1-大于，2-小于，3-介于，4-等于，5-发生日期"`
 	LeftValue              string `description:"左值"`
-	LeftValueShow          string `description:"左值前端显示"`
+	LeftValueBack          string `description:"左值前端显示"`
 	LeftValueType          int    `description:"左值类型"`
 	RightValue             string `description:"右值"`
-	RightValueShow         string `description:"右值前端显示"`
+	RightValueBack         string `description:"右值前端显示"`
 	RightValueType         int    `description:"右值类型"`
 	FontColor              string `description:"字体颜色"`
 	BackgroundColor        string `description:"背景颜色"`

services/excel/luck_sheet_table.go

@@ -55,7 +55,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
@@ -76,7 +76,7 @@ func checkCellRule(ruleInfo *models.ExcelInfoRuleMappingView, value string, tabl
 	var err error
 
 	if ruleInfo.RuleType == 5 {
-		tableTime, err = time.Parse(utils.FormatDate, value)
+		tableTime, err = time.ParseInLocation(utils.FormatDate, value, time.Local)
 		if err != nil {
 			return false
 		}
@@ -89,7 +89,7 @@ func checkCellRule(ruleInfo *models.ExcelInfoRuleMappingView, value string, tabl
 	switch ruleInfo.RuleType {
 	// 大于
 	case 1:
-		conditionValue, ok := getCellValueByType(ruleInfo.LeftValue, ruleInfo.LeftValueType, tableDataList)
+		conditionValue, ok := getCellValueByType(ruleInfo.LeftValueBack, ruleInfo.LeftValueType, tableDataList)
 		if !ok {
 			return false
 		}
@@ -98,7 +98,7 @@ func checkCellRule(ruleInfo *models.ExcelInfoRuleMappingView, value string, tabl
 		}
 	// 小于
 	case 2:
-		conditionValue, ok := getCellValueByType(ruleInfo.LeftValue, ruleInfo.LeftValueType, tableDataList)
+		conditionValue, ok := getCellValueByType(ruleInfo.LeftValueBack, ruleInfo.LeftValueType, tableDataList)
 		if !ok {
 			return false
 		}
@@ -107,7 +107,7 @@ func checkCellRule(ruleInfo *models.ExcelInfoRuleMappingView, value string, tabl
 		}
 	// 介于
 	case 3:
-		leftcondValue, ok := getCellValueByType(ruleInfo.LeftValue, ruleInfo.LeftValueType, tableDataList)
+		leftcondValue, ok := getCellValueByType(ruleInfo.LeftValueBack, ruleInfo.LeftValueType, tableDataList)
 		if !ok {
 			return false
 		}
@@ -120,7 +120,7 @@ func checkCellRule(ruleInfo *models.ExcelInfoRuleMappingView, value string, tabl
 		}
 	// 等于
 	case 4:
-		conditionValue, ok := getCellValueByType(ruleInfo.LeftValue, ruleInfo.LeftValueType, tableDataList)
+		conditionValue, ok := getCellValueByType(ruleInfo.LeftValueBack, ruleInfo.LeftValueType, tableDataList)
 		if !ok {
 			return false
 		}
@@ -131,7 +131,7 @@ func checkCellRule(ruleInfo *models.ExcelInfoRuleMappingView, value string, tabl
 	case 5:
 		// 发生日期
 		var dateStart, dataEnd time.Time
-		switch value {
+		switch ruleInfo.LeftValueBack {
 		// 今天
 		case "today":
 			// 获得今天的零点零分零秒

utils/time.go

@@ -4,7 +4,8 @@ import "time"
 
 // 获取今天的日期（零点零分零秒）
 func Today() time.Time {
-	return time.Now().Round(0).UTC().Local()
+	now := time.Now()
+	return time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
 }
 
 // 获取明天的日期（零点零分零秒）