From 37971f68758199e7df8dc612f8d5d75aad330a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Sat, 3 Sep 2022 21:39:02 +0800 Subject: [PATCH] =?UTF-8?q?fix(report):=E4=BF=AE=E5=A4=8D=E9=85=8D?= =?UTF-8?q?=E7=94=B5=E7=89=A9=E4=B8=9A=E8=B4=B9=E9=83=A8=E5=88=86=E7=9A=84?= =?UTF-8?q?=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/report_summary.go | 1 + service/calculate.go | 5 +++-- service/report.go | 35 ++++++++++++++++++----------------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/model/report_summary.go b/model/report_summary.go index 02dea90..e70ae35 100644 --- a/model/report_summary.go +++ b/model/report_summary.go @@ -55,6 +55,7 @@ type ReportSummary struct { MaintenanceDilutedPrice decimal.NullDecimal `xorm:"numeric(16,8)" json:"maintencanceDilutedPrice"` LossDilutedPrice decimal.NullDecimal `xorm:"numeric(16,8)" json:"lossDilutedPrice"` PublicConsumptionDilutedPrice decimal.NullDecimal `xorm:"numeric(16,8)" json:"publicConsumptionDilutedPrice"` + MaintenanceOverall decimal.NullDecimal `xorm:"numeric(16,8)" json:"maintenanceOverall"` FinalDilutedOverall decimal.NullDecimal `xorm:"numeric(14,2)" json:"finalDilutedOverall"` } diff --git a/service/calculate.go b/service/calculate.go index d31155a..f26c62c 100644 --- a/service/calculate.go +++ b/service/calculate.go @@ -79,13 +79,13 @@ func (_CalculateService) ComprehensivelyCalculateReport(reportId string) (err er summary.PublicConsumption.Decimal = summary.PublicConsumption.Decimal.Add(eu.Overall.Decimal) summary.PublicConsumptionCritical.Decimal = summary.PublicConsumptionCritical.Decimal.Add(eu.Critical.Decimal) summary.PublicConsumptionPeak.Decimal = summary.PublicConsumptionPeak.Decimal.Add(eu.Peak.Decimal) - summary.PublicConsumptionFlat.Decimal = summary.PublicConsumptionPeak.Decimal.Add(eu.Flat.Decimal) + summary.PublicConsumptionFlat.Decimal = summary.PublicConsumptionFlat.Decimal.Add(eu.Flat.Decimal) summary.PublicConsumptionValley.Decimal = summary.PublicConsumptionValley.Decimal.Add(eu.Valley.Decimal) } else { summary.CustomerConsumption.Decimal = summary.CustomerConsumption.Decimal.Add(eu.Overall.Decimal) summary.CustomerConsumptionCritical.Decimal = summary.CustomerConsumptionCritical.Decimal.Add(eu.Critical.Decimal) summary.CustomerConsumptionPeak.Decimal = summary.CustomerConsumptionPeak.Decimal.Add(eu.Peak.Decimal) - summary.CustomerConsumptionFlat.Decimal = summary.CustomerConsumptionPeak.Decimal.Add(eu.Flat.Decimal) + summary.CustomerConsumptionFlat.Decimal = summary.CustomerConsumptionFlat.Decimal.Add(eu.Flat.Decimal) summary.CustomerConsumptionValley.Decimal = summary.CustomerConsumptionValley.Decimal.Add(eu.Valley.Decimal) } } @@ -162,6 +162,7 @@ func (_CalculateService) ComprehensivelyCalculateReport(reportId string) (err er } // 计算摊薄总计 + summary.MaintenanceOverall = decimal.NewNullDecimal(maintenanceFeeTotal) summary.FinalDilutedOverall = decimal.NewNullDecimal( summary.BasicFee. Add(summary.AdjustFee). diff --git a/service/report.go b/service/report.go index 71eb84e..b5fbc6d 100644 --- a/service/report.go +++ b/service/report.go @@ -570,25 +570,26 @@ func (_ReportService) AssembleReportPublicity(reportId string) (*model.Publicity Proportion: summary.LossProportion.Decimal, } publicSummary := model.PublicConsumptionOverallPart{ - Overall: summary.PublicConsumption.Decimal, - OverallPrice: summary.OverallPrice.Decimal, - OverallFee: summary.PublicConsumptionFee.Decimal, - Critical: summary.PublicConsumptionCritical, - CriticalPrice: summary.CriticalPrice, - CriticalFee: summary.PublicConsumptionCriticalFee, - Peak: summary.PublicConsumptionPeak, - PeakPrice: summary.PeakPrice, - PeakFee: summary.PublicConsumptionPeakFee, - Flat: summary.PublicConsumptionFlat, - FlatPrice: summary.FlatPrice, - FlatFee: summary.PublicConsumptionFlatFee, - Valley: summary.PublicConsumptionValley, - ValleyPrice: summary.ValleyPrice, - ValleyFee: summary.PublicConsumptionValleyFee, - Proportion: summary.PublicConsumptionProportion.Decimal, + Overall: summary.PublicConsumption.Decimal, + OverallPrice: summary.OverallPrice.Decimal, + ConsumptionFee: summary.PublicConsumptionFee.Decimal, + OverallFee: summary.PublicConsumptionFee.Decimal, + Critical: summary.PublicConsumptionCritical, + CriticalPrice: summary.CriticalPrice, + CriticalFee: summary.PublicConsumptionCriticalFee, + Peak: summary.PublicConsumptionPeak, + PeakPrice: summary.PeakPrice, + PeakFee: summary.PublicConsumptionPeakFee, + Flat: summary.PublicConsumptionFlat, + FlatPrice: summary.FlatPrice, + FlatFee: summary.PublicConsumptionFlatFee, + Valley: summary.PublicConsumptionValley, + ValleyPrice: summary.ValleyPrice, + ValleyFee: summary.PublicConsumptionValleyFee, + Proportion: summary.PublicConsumptionProportion.Decimal, } otherCollection := model.OtherShouldCollectionPart{ - MaintenanceFee: summary.FinalDilutedOverall, + MaintenanceFee: summary.MaintenanceOverall, BasicFees: summary.BasicFee.Add(summary.AdjustFee), } finalMaintenance := lossPart.ConsumptionFee.Add(publicSummary.ConsumptionFee).Add(otherCollection.MaintenanceFee.Decimal).Add(otherCollection.BasicFees)