diff --git a/services/pln/implments/CustOrder.Dashborad.impl.go b/services/pln/implments/CustOrder.Dashborad.impl.go index 7cbf2c1..ebd42dc 100644 --- a/services/pln/implments/CustOrder.Dashborad.impl.go +++ b/services/pln/implments/CustOrder.Dashborad.impl.go @@ -848,7 +848,13 @@ func (impl *CustOrderServiceImplement) SelectTeamTemPo(user *global.User, dayMod packTimes := impl.GetUsefulTime(WorkShift1StartTime, time.Now(), timeModelList) if countPack > 0 { TeamTemPoNumber = utils.Decimal(float64(packTimes)/float64(countPack), 2) - PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num), 4) + if packTimes > 0 { + packHours := packTimes / 3600 + PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num)/float64(packHours), 4) + } else { + PerTeamTemPoNumber = 0 + } + } else { TeamTemPoNumber = 0 PerTeamTemPoNumber = 0 @@ -872,7 +878,12 @@ func (impl *CustOrderServiceImplement) SelectTeamTemPo(user *global.User, dayMod packTimes := impl.GetUsefulTime(WorkShift2StartTime, time.Now(), timeModelList) if countPack > 0 { TeamTemPoNumber = utils.Decimal(float64(packTimes)/float64(countPack), 2) - PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num), 4) + if packTimes > 0 { + packHours := packTimes / 3600 + PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num)/float64(packHours), 4) + } else { + PerTeamTemPoNumber = 0 + } } else { TeamTemPoNumber = 0 PerTeamTemPoNumber = 0 @@ -895,7 +906,12 @@ func (impl *CustOrderServiceImplement) SelectTeamTemPo(user *global.User, dayMod packTimes := impl.GetUsefulTime(WorkShift3StartTime, time.Now(), timeModelList) if countPack > 0 { TeamTemPoNumber = utils.Decimal(float64(packTimes)/float64(countPack), 2) - PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num), 4) + if packTimes > 0 { + packHours := packTimes / 3600 + PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num)/float64(packHours), 4) + } else { + PerTeamTemPoNumber = 0 + } } else { TeamTemPoNumber = 0 PerTeamTemPoNumber = 0