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

fix(report):修正报表中获取分摊表计的功能，补充应获取但未获取的字段。

Browse Source
This commit is contained in:
徐涛
2023-06-26 21:52:17 +08:00
parent 877b8304c3
commit 7806f07766
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vo/report.go
View File

@@ -210,9 +210,9 @@ func (rpqr *ReportPublicQueryResponse) FromReportDetailPublicConsumption(value *
}
type ReportPooledQueryResponse struct {
SimplifiedMeterQueryResponse
Overall ConsumptionDisplay `json:"overall"`
PoolMethod int16 `json:"poolMethod"`
SimplifiedMeterQueryResponse `copier:"MeterDetail"`
Overall ConsumptionDisplay `json:"overall"`
PoolMethod int16 `json:"poolMethod"`
}
func (rpqr *ReportPooledQueryResponse) FromReportDetailPooledConsumption(value *model.ReportDetailedPooledConsumption) {
@@ -221,10 +221,10 @@ func (rpqr *ReportPooledQueryResponse) FromReportDetailPooledConsumption(value *
rpqr.PoolMethod = value.PublicPooled
}
func (rqpr *ReportPooledQueryResponse) FromReportDetailNestedMeterConsumption(value *model.ReportDetailNestedMeterConsumption) {
copier.Copy(&rqpr.SimplifiedMeterQueryResponse, &value.Meter)
rqpr.Overall.FromConsumptionUnit(&value.Consumption.Overall)
rqpr.PoolMethod = -1
func (rpqr *ReportPooledQueryResponse) FromReportDetailNestedMeterConsumption(value *model.ReportDetailNestedMeterConsumption) {
copier.Copy(&rpqr.SimplifiedMeterQueryResponse, &value.Meter)
rpqr.Overall.FromConsumptionUnit(&value.Consumption.Overall)
rpqr.PoolMethod = -1
}
type ReportTenementSummaryResponse struct {