|
@@ -92,15 +92,10 @@ func AnalysisAccuracyService(req *models.AnalysisAccuracyRequest) (*models.Analy
|
|
|
var mixedFodderAccurateRatio float64 = 0
|
|
|
if mixed.Lweight > 0 && mixed.ActualWeightMinus > 0 {
|
|
|
if mixed.Lweight > mixed.ActualWeightMinus {
|
|
|
- mixedFodderAccurateRatio = mixed.Lweight / mixed.ActualWeightMinus * 100
|
|
|
- } else {
|
|
|
mixedFodderAccurateRatio = mixed.ActualWeightMinus / mixed.Lweight * 100
|
|
|
+ } else {
|
|
|
+ mixedFodderAccurateRatio = mixed.Lweight / mixed.ActualWeightMinus * 100
|
|
|
}
|
|
|
-
|
|
|
- fmt.Println("===========dayTime=========", dayTime)
|
|
|
- fmt.Println("===========mixed.ActualWeightMinus=========", mixed.ActualWeightMinus)
|
|
|
- fmt.Println("===========mixed.Lweight=========", mixed.Lweight)
|
|
|
- fmt.Println("===========mixedFodderAccurateRatio=========", mixedFodderAccurateRatio)
|
|
|
}
|
|
|
mixedValue := &models.PastureAnalysisAccuracyDataValue{
|
|
|
DayTime: dayTime,
|
|
@@ -126,9 +121,9 @@ func AnalysisAccuracyService(req *models.AnalysisAccuracyRequest) (*models.Analy
|
|
|
var sprinkleFodderAccurateRatio float64 = 0
|
|
|
if sprinkle.Lweight > 0 && sprinkle.ActualWeightMinus > 0 {
|
|
|
if sprinkle.Lweight > sprinkle.ActualWeightMinus {
|
|
|
- sprinkleFodderAccurateRatio = sprinkle.Lweight / sprinkle.ActualWeightMinus * 100
|
|
|
- } else {
|
|
|
sprinkleFodderAccurateRatio = sprinkle.ActualWeightMinus / sprinkle.Lweight * 100
|
|
|
+ } else {
|
|
|
+ sprinkleFodderAccurateRatio = sprinkle.Lweight / sprinkle.ActualWeightMinus * 100
|
|
|
}
|
|
|
}
|
|
|
sprinkleValue := &models.PastureAnalysisAccuracyDataValue{
|