ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

enhance(publicity):向前端返回的终端用户数据增加公共设施与摊薄标记。

Browse Source
This commit is contained in:
徐涛 2022-09-20 06:39:57 +08:00
parent 794054b831
commit a13193cfa4
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/publicity.go
View File

@ -88,6 +88,8 @@ type EndUserSummary struct {
CustomerName *string `json:"customerName"` CustomerName *string `json:"customerName"`
Address *string `json:"address"` Address *string `json:"address"`
MeterId string `json:"meterId"` MeterId string `json:"meterId"`
IsPublicMeter bool `json:"isPublicMeter"`
Diluted bool `json:"willDilute"`
Overall decimal.Decimal `json:"overall"` Overall decimal.Decimal `json:"overall"`
OverallFee decimal.Decimal `json:"overallFee"` OverallFee decimal.Decimal `json:"overallFee"`
Critical decimal.NullDecimal `json:"critical"` Critical decimal.NullDecimal `json:"critical"`

2
service/report.go
View File

@ -704,6 +704,8 @@ func (_ReportService) AssembleReportPublicity(reportId string) (*model.Publicity
CustomerName: elem.CustomerName, CustomerName: elem.CustomerName,
Address: elem.Address, Address: elem.Address,
MeterId: elem.MeterId, MeterId: elem.MeterId,
IsPublicMeter: elem.IsPublicMeter,
Diluted: elem.WillDilute,
Overall: elem.Overall.Decimal, Overall: elem.Overall.Decimal,
OverallFee: elem.OverallFee.Decimal, OverallFee: elem.OverallFee.Decimal,
Critical: elem.Critical, Critical: elem.Critical,