Merge branch 'feature/tmr-group' of baishaojie/tmrgo into develop

service/group/group.go

@@ -66,11 +66,6 @@ func AnalysisAccuracyService(req *models.AnalysisAccuracyRequest) (*models.Analy
 	if err != nil {
 		return nil, err
 	}
-
-	b, _ := json.Marshal(mixedFodderDataList)
-	fmt.Println("=======mixedFodderDataList======", string(b))
-	c, _ := json.Marshal(sprinkleFodderDataList)
-	fmt.Println("=======sprinkleFodderDataList======", string(c))
 	// 混料正确率
 	mixedFodderCorrectDataList, err := module.MixedFodderCorrectData(req)
 	if err != nil {
@@ -80,6 +75,11 @@ func AnalysisAccuracyService(req *models.AnalysisAccuracyRequest) (*models.Analy
 	// 撒料正确率
 	sprinkleFodderCorrectDataList, err := module.SprinkleFodderCorrectData(req)
 
+	a, _ := json.Marshal(mixedFodderCorrectDataList)
+	fmt.Println("====mixedFodderCorrectDataList===", string(a))
+	b, _ := json.Marshal(sprinkleFodderCorrectDataList)
+	fmt.Println("====mixedFodderCorrectDataList===", string(b))
+
 	timeList := util.TimeBetween(req.StartDate, req.EndDate)
 	for _, dayTime := range timeList {
 		var mixedInfo, sprinkleInfo, mixedCorrectInfo, sprinkleCorrectInfo bool
@@ -194,8 +194,7 @@ func AnalysisAccuracyService(req *models.AnalysisAccuracyRequest) (*models.Analy
 			})
 		}
 	}
-	d, _ := json.Marshal(response)
-	fmt.Println("=======response======", string(d))
+
 	return response, nil
 }