From 5332fc9b4ff8251bfb32c1e0bf5bb68e3407c36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Sat, 3 Sep 2022 22:03:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(enduser):=E4=BF=AE=E6=AD=A3=E6=8A=84?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=EF=BC=8C=E5=B9=B3=E6=AE=B5=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9A=84=E8=AE=A1=E7=AE=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/end_user_detail.go | 1 + service/end_user.go | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/model/end_user_detail.go b/model/end_user_detail.go index 7356fd6..66bbf49 100644 --- a/model/end_user_detail.go +++ b/model/end_user_detail.go @@ -73,6 +73,7 @@ func (d EndUserDetail) Validate() (bool, error) { } func (d *EndUserDetail) CalculatePeriod() { + d.LastPeriodFlat = d.LastPeriodOverall.Sub(d.LastPeriodCritical).Sub(d.LastPeriodPeak).Sub(d.LastPeriodValley) d.CurrentPeriodFlat = d.CurrentPeriodOverall.Sub(d.CurrentPeriodCritical).Sub(d.CurrentPeriodPeak).Sub(d.CurrentPeriodValley) d.Overall = decimal.NewNullDecimal(d.CurrentPeriodOverall.Sub(d.LastPeriodOverall).Mul(d.Ratio).Add(d.AdjustOverall).RoundBank(2)) d.Critical = decimal.NewNullDecimal(d.CurrentPeriodCritical.Sub(d.LastPeriodCritical).Mul(d.Ratio).Add(d.AdjustCritical).RoundBank(2)) diff --git a/service/end_user.go b/service/end_user.go index b417d67..96ae9b6 100644 --- a/service/end_user.go +++ b/service/end_user.go @@ -210,6 +210,10 @@ func (es _EndUserService) BatchImportNonPVRegister(reportId string, file io.Read }); has { if appears.Appears <= 1 { elem.LastPeriodOverall = im.LastPeriodOverall + elem.LastPeriodCritical = decimal.Zero + elem.LastPeriodPeak = decimal.Zero + elem.LastPeriodValley = decimal.Zero + elem.LastPeriodFlat = elem.LastPeriodOverall.Sub(elem.LastPeriodCritical).Sub(elem.LastPeriodPeak).Sub(elem.LastPeriodValley) elem.Initialize = true } } @@ -303,6 +307,7 @@ func (es _EndUserService) BatchImportPVRegister(reportId string, file io.Reader) elem.LastPeriodCritical = im.LastPeriodCritical.Decimal elem.LastPeriodPeak = im.LastPeriodPeak.Decimal elem.LastPeriodValley = im.LastPeriodValley.Decimal + elem.LastPeriodFlat = elem.LastPeriodOverall.Sub(elem.LastPeriodCritical).Sub(elem.LastPeriodPeak).Sub(elem.LastPeriodValley) elem.Initialize = true } }