diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 6e949dd93..86c0cfc13 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -324,6 +324,7 @@ func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics { value.NotActivateRegistUser += userMetrics.NotActivateRegistUser value.HasActivityUser += userMetrics.HasActivityUser value.TotalRegistUser += userMetrics.ActivateRegistUser + userMetrics.NotActivateRegistUser + value.ActivateIndex = float64(value.ActivateRegistUser) / float64(value.TotalRegistUser) value.DaysForMonth += 1 } } diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index 5b2592764..d7038103f 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -58,9 +58,9 @@ func writeUserMetricsExcel(row int, xlsx *excelize.File, sheetName string, userM tmp = tmp + 1 t := userMetrics.ActivateIndex * 100 value := "-" - if t < 100 { + if t < 100 && t > 0 { value = fmt.Sprintf("%.2f", t) + "%" - } else { + } else if t >= 100 { value = "100%" } xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, value)