From c83024f693e93adbb9ba336dbf4818843709cde9 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Tue, 29 Jun 2021 10:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mu=E7=9A=84=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/report/implments/FilterDataInfo.service.impl.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/services/report/implments/FilterDataInfo.service.impl.go b/services/report/implments/FilterDataInfo.service.impl.go index 732a43a..17685d9 100644 --- a/services/report/implments/FilterDataInfo.service.impl.go +++ b/services/report/implments/FilterDataInfo.service.impl.go @@ -470,7 +470,7 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM } } } - if dayModelNr == 0 || yesterdayModelNr == 0{ + if dayModelNr == 0 || yesterdayModelNr == 0 { return nil, grmi.NewBusinessError("未获取到该工位的日模型主数据") } dayModel, err := dayModelDao.SelectOne(dayModelNr) @@ -547,7 +547,6 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM yesterdayStartStr := yesterdayBegin.Add(time.Duration(yesterdayStart) * time.Second).Format(grmi.DatetimeOutFormat) yesterdayEndStr := yesterdayBegin.Add(time.Duration(yesterdayEnd) * time.Second).Format(grmi.DatetimeOutFormat) - // 求取今天的开始 结束时间 var startInt int if dayModel.WorkShiftToggle { @@ -623,6 +622,7 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM } // 计算昨天的mu var mu float64 + var yesterdaySum float64 yesterdayCapacity := 0 for _, dataInfo := range yesterdayArcLi { targetValue := reflect.ValueOf(dataInfo).FieldByName(statisticField).String() @@ -637,12 +637,13 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM continue } yesterdayCapacity++ + yesterdaySum += target } - + yesterdayAvg := yesterdaySum / float64(yesterdayCapacity) if yesterdayCapacity == 0 { mu = 0 } else { - mu = float64(yesterdayCapacity) / (float64(yesterdayLength) / 3600) + mu = float64(yesterdayCapacity) * yesterdayAvg / float64(yesterdayLength) } mu, err = strconv.ParseFloat(fmt.Sprintf("%.2f", mu), 64) if err != nil {