|
@@ -1490,24 +1490,31 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
|
|
|
|
|
|
|
|
|
- for i := range prevTotalMoneySlice {
|
|
|
- var yoy float64
|
|
|
- var yoyStr string
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- totalMoneySlice[i], _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalMoneySlice[i] - prevTotalMoneySlice[i]), 64)
|
|
|
- if prevTotalMoneySlice[i] != 0 && totalMoneySlice[i] != 0 {
|
|
|
- yoy = (totalMoneySlice[i] - prevTotalMoneySlice[i]) / prevTotalMoneySlice[i]
|
|
|
- yoyStr = fmt.Sprintf("%.4f", yoy)
|
|
|
-
|
|
|
- if i == len(prevTotalMoneySlice)-1 && i > 0 && req.ListParam == "3" {
|
|
|
- fmt.Println("totalMoneySlice[i-1]:", totalMoneySlice[i-1])
|
|
|
- yoy = (totalMoneySlice[i] - totalMoneySlice[i-1]) / totalMoneySlice[i-1]
|
|
|
+ if req.ListParam == "0" {
|
|
|
+ for i := range prevTotalMoneySlice {
|
|
|
+ if i > 2 {
|
|
|
+
|
|
|
+ var yoy float64
|
|
|
+ var yoyStr string
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ totalMoneySlice[i], _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalMoneySlice[i] - prevTotalMoneySlice[i]), 64)
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ yoy = (totalMoneySlice[i] + totalMoneySlice[i-1] + totalMoneySlice[i-2]) / 3
|
|
|
yoyStr = fmt.Sprintf("%.4f", yoy)
|
|
|
+ yoySlice = append(yoySlice, yoyStr)
|
|
|
}
|
|
|
}
|
|
|
- yoySlice = append(yoySlice, yoyStr)
|
|
|
}
|
|
|
}
|
|
|
|