Merge branch 'feature/group_list' of xuyiping/kpt-tmr-group into release/v1.0.2

module/backend/dashboard_service.go

@@ -191,6 +191,11 @@ func (s *StoreEntry) SearchAnalysisAccuracy(ctx context.Context, req *operationP
 	}
 	res.Data.Table = s.TitleList(ctx, pastureAnalysisAccuracy)
 
+	dashboardTopData, err := s.DashboardTopPasture(ctx, req)
+	if err != nil {
+		return nil, xerr.WithStack(err)
+	}
+
 	dashboardTopData1 := &model.Chart1{
 		MixedFodderAccurateRatio: &model.PastureTopData1{
 			Title: make([]string, 0),
@@ -310,22 +315,22 @@ func (s *StoreEntry) SearchAnalysisAccuracy(ctx context.Context, req *operationP
 	dashboardTopData1.SprinkleFodderCorrectRatio.MiddleValue = fmt.Sprintf("%.2f", getPastureDayTimeRatioMiddleValue(pastureDayTimeRatioList[operationPb.DashboardTopType_Sprinkle_CORRECT]))
 	dashboardTopData1.SprinkleFodderCorrectRatio.TopOneName = pastureTopDataList.Data.SprinkleFodderCorrectRatio[0].PastureName
 
-	for _, v := range pastureDayTimeRatioList[operationPb.DashboardTopType_MIXED_ACCURATE] {
+	for _, v := range dashboardTopData.MixedFodderCorrectRatio {
 		dashboardTopData1.MixedFodderCorrectRatio.Title = append(dashboardTopData1.MixedFodderCorrectRatio.Title, v.PastureName)
 		dashboardTopData1.MixedFodderCorrectRatio.Ratio = append(dashboardTopData1.MixedFodderCorrectRatio.Ratio, v.Ratio)
 	}
 
-	for _, v := range pastureDayTimeRatioList[operationPb.DashboardTopType_MIXED_CORRECT] {
+	for _, v := range dashboardTopData.MixedFodderAccurateRatio {
 		dashboardTopData1.MixedFodderAccurateRatio.Title = append(dashboardTopData1.MixedFodderAccurateRatio.Title, v.PastureName)
 		dashboardTopData1.MixedFodderAccurateRatio.Ratio = append(dashboardTopData1.MixedFodderAccurateRatio.Ratio, v.Ratio)
 	}
 
-	for _, v := range pastureDayTimeRatioList[operationPb.DashboardTopType_SPRINKLE_ACCURATE] {
+	for _, v := range dashboardTopData.SprinkleFodderAccurateRatio {
 		dashboardTopData1.SprinkleFodderAccurateRatio.Title = append(dashboardTopData1.SprinkleFodderAccurateRatio.Title, v.PastureName)
 		dashboardTopData1.SprinkleFodderAccurateRatio.Ratio = append(dashboardTopData1.SprinkleFodderAccurateRatio.Ratio, v.Ratio)
 	}
 
-	for _, v := range pastureDayTimeRatioList[operationPb.DashboardTopType_Sprinkle_CORRECT] {
+	for _, v := range dashboardTopData.SprinkleFodderCorrectRatio {
 		dashboardTopData1.SprinkleFodderCorrectRatio.Title = append(dashboardTopData1.SprinkleFodderCorrectRatio.Title, v.PastureName)
 		dashboardTopData1.SprinkleFodderCorrectRatio.Ratio = append(dashboardTopData1.SprinkleFodderCorrectRatio.Ratio, v.Ratio)
 	}