|
@@ -4520,8 +4520,10 @@ func MarkerLineCalculate(markerLine data_manage.MarkersLine, dataList interface{
|
|
|
length += 1
|
|
|
}
|
|
|
}
|
|
|
- averge = averge / float64(length)
|
|
|
- value = fmt.Sprintf("%.2f", averge)
|
|
|
+ if length > 0 {
|
|
|
+ averge = averge / float64(length)
|
|
|
+ value = fmt.Sprintf("%.2f", averge)
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
dataList := dataList.([]*data_manage.EdbDataList)
|
|
@@ -4563,9 +4565,11 @@ func MarkerLineCalculate(markerLine data_manage.MarkersLine, dataList interface{
|
|
|
length += 1
|
|
|
}
|
|
|
}
|
|
|
- averge = averge / float64(length)
|
|
|
+ if length > 0 {
|
|
|
+ averge = averge / float64(length)
|
|
|
+ value = fmt.Sprintf("%.2f", averge)
|
|
|
+ }
|
|
|
|
|
|
- value = fmt.Sprintf("%.2f", averge)
|
|
|
}
|
|
|
} else if markerLine.Calculation == 2 {
|
|
|
// 区间均值加N倍标准差
|
|
@@ -4617,7 +4621,10 @@ func MarkerLineCalculate(markerLine data_manage.MarkersLine, dataList interface{
|
|
|
length += 1
|
|
|
}
|
|
|
}
|
|
|
- averge = averge / float64(length)
|
|
|
+
|
|
|
+ if length > 0 {
|
|
|
+ averge = averge / float64(length)
|
|
|
+ }
|
|
|
if len(faloatList) <= 0 {
|
|
|
err = errors.New(`数据为空`)
|
|
|
return
|
|
@@ -4671,7 +4678,9 @@ func MarkerLineCalculate(markerLine data_manage.MarkersLine, dataList interface{
|
|
|
length += 1
|
|
|
}
|
|
|
}
|
|
|
- averge = averge / float64(length)
|
|
|
+ if length > 0 {
|
|
|
+ averge = averge / float64(length)
|
|
|
+ }
|
|
|
if len(floatList) <= 0 {
|
|
|
err = errors.New(`数据为空`)
|
|
|
return
|
|
@@ -5365,6 +5374,17 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+// GetMarkerLine
|
|
|
+// @Description: 获取标识线
|
|
|
+// @author: Roc
|
|
|
+// @datetime 2025-05-16 18:42:59
|
|
|
+// @param markerLine data_manage.MarkersLine
|
|
|
+// @param edbList []*data_manage.ChartEdbInfoMapping
|
|
|
+// @param chartInfo *data_manage.ChartInfoView
|
|
|
+// @param startDate string
|
|
|
+// @param endDate string
|
|
|
+// @return newMarkerLine data_manage.MarkersLine
|
|
|
+// @return err error
|
|
|
func GetMarkerLine(markerLine data_manage.MarkersLine, edbList []*data_manage.ChartEdbInfoMapping, chartInfo *data_manage.ChartInfoView, startDate, endDate string) (newMarkerLine data_manage.MarkersLine, err error) {
|
|
|
newMarkerLine = markerLine
|
|
|
|