Merge branch 'feature/fix_excel_bug_cf' of eta_server/eta_chart_lib into debug

controllers/chart.go

@@ -6,14 +6,12 @@ import (
 	"eta/eta_chart_lib/models/data_manage"
 	"eta/eta_chart_lib/models/data_manage/cross_variety/request"
 	"eta/eta_chart_lib/models/data_manage/excel"
-	"eta/eta_chart_lib/services/alarm_msg"
 	"eta/eta_chart_lib/services/data"
 	"eta/eta_chart_lib/services/data/cross_variety"
 	"eta/eta_chart_lib/services/data/range_analysis"
 	dwmini "eta/eta_chart_lib/services/dw_mini"
 	"eta/eta_chart_lib/utils"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -55,7 +53,6 @@ func (this *ChartController) ChartInfoDetail() {
 		return
 	}
 	var isCollect bool
-	alarm_msg.SendAlarmMsg(fmt.Sprintf("图表请求,source:%d, code:%s, token:%s", source, uniqueCode, token), 1)
 	if source == utils.CHART_SOURCE_DW && token != "" {
 		tmpIsCollect, err := dwmini.GetMyChartIsCollect(token, uniqueCode)
 		if err != nil {
@@ -64,7 +61,6 @@ func (this *ChartController) ChartInfoDetail() {
 			return
 		}
 		isCollect = tmpIsCollect
-		alarm_msg.SendAlarmMsg(fmt.Sprintf("图表收藏状态%s, code:%s, token:%s", strconv.FormatBool(isCollect), uniqueCode, token), 1)
 	}
 
 	//判断是否有缓存
@@ -79,7 +75,6 @@ func (this *ChartController) ChartInfoDetail() {
 					if isCollect {
 						resp.IsCollect = isCollect
 					}
-					alarm_msg.SendAlarmMsg(fmt.Sprintf("redis: 图表收藏状态%s, code:%s, token:%s", strconv.FormatBool(isCollect), uniqueCode, token), 1)
 					br.Ret = 200
 					br.Success = true
 					br.Msg = "获取成功"
@@ -149,8 +144,6 @@ func (this *ChartController) ChartInfoDetail() {
 		resp.IsCollect = isCollect
 	}
 
-	alarm_msg.SendAlarmMsg(fmt.Sprintf("图表状态%s, code:%s, token:%s", strconv.FormatBool(isCollect), uniqueCode, token), 1)
-
 	if conf[models.BusinessConfWatermarkChart] == "true" && conf[models.BusinessConfCompanyWatermark] != "" {
 		resp.WaterMark = conf[models.BusinessConfCompanyWatermark]
 	}

services/excel/lucky_sheet.go

@@ -1262,7 +1262,7 @@ func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq, hide
 							hasPercent = true
 						}
 						if styleConfig.Decimal != nil {
-							tmp.Monitor = roundNumber(cell.Value, *styleConfig.Decimal, hasPercent)
+							tmp.Monitor = roundNumber(cell.ShowValue, *styleConfig.Decimal, hasPercent)
 						} else {
 							if hasPercent {
 								tmpValue = tmpValue * 100