diff --git a/model/publicity.go b/model/publicity.go index b02830f..7249fd3 100644 --- a/model/publicity.go +++ b/model/publicity.go @@ -85,18 +85,20 @@ type MaintenancePart struct { } type EndUserSummary struct { - CustomerName *string `json:"customerName"` - Address *string `json:"address"` - MeterId string `json:"meterId"` - Overall decimal.Decimal `json:"overall"` - OverallFee decimal.Decimal `json:"overallFee"` - Critical decimal.NullDecimal `json:"critical"` - CriticalFee decimal.NullDecimal `json:"criticalFee"` - Peak decimal.NullDecimal `json:"peak"` - PeakFee decimal.NullDecimal `json:"peakFee"` - Valley decimal.NullDecimal `json:"valley"` - ValleyFee decimal.NullDecimal `json:"valleyFee"` - Maintenance decimal.Decimal `json:"maintenance"` + CustomerName *string `json:"customerName"` + Address *string `json:"address"` + MeterId string `json:"meterId"` + IsPublicMeter bool `json:"isPublicMeter"` + Diluted bool `json:"willDilute"` + Overall decimal.Decimal `json:"overall"` + OverallFee decimal.Decimal `json:"overallFee"` + Critical decimal.NullDecimal `json:"critical"` + CriticalFee decimal.NullDecimal `json:"criticalFee"` + Peak decimal.NullDecimal `json:"peak"` + PeakFee decimal.NullDecimal `json:"peakFee"` + Valley decimal.NullDecimal `json:"valley"` + ValleyFee decimal.NullDecimal `json:"valleyFee"` + Maintenance decimal.Decimal `json:"maintenance"` } type Publicity struct { diff --git a/service/report.go b/service/report.go index 6725192..2ec9526 100644 --- a/service/report.go +++ b/service/report.go @@ -701,18 +701,20 @@ func (_ReportService) AssembleReportPublicity(reportId string) (*model.Publicity report.EndUsers, func(elem *model.EndUserDetail, index int) model.EndUserSummary { return model.EndUserSummary{ - CustomerName: elem.CustomerName, - Address: elem.Address, - MeterId: elem.MeterId, - Overall: elem.Overall.Decimal, - OverallFee: elem.OverallFee.Decimal, - Critical: elem.Critical, - CriticalFee: elem.CriticalFee, - Peak: elem.Peak, - PeakFee: elem.PeakFee, - Valley: elem.Valley, - ValleyFee: elem.ValleyFee, - Maintenance: elem.FinalDiluted.Decimal, + CustomerName: elem.CustomerName, + Address: elem.Address, + MeterId: elem.MeterId, + IsPublicMeter: elem.IsPublicMeter, + Diluted: elem.WillDilute, + Overall: elem.Overall.Decimal, + OverallFee: elem.OverallFee.Decimal, + Critical: elem.Critical, + CriticalFee: elem.CriticalFee, + Peak: elem.Peak, + PeakFee: elem.PeakFee, + Valley: elem.Valley, + ValleyFee: elem.ValleyFee, + Maintenance: elem.FinalDiluted.Decimal, } }, )