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

fix(#22):修复部分字段读数问题

Browse Source
This commit is contained in:
DEKA_123 2023-08-14 14:42:15 +08:00
parent 37bd0da1f2
commit 8a383515d3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controller/report.go
View File

@ -257,14 +257,16 @@ func getReportSummary(c *fiber.Ctx) error {
}, },
Area: report.OverallArea, Area: report.OverallArea,
BasicFee: report.BasicFee, BasicFee: report.BasicFee,
PooledBasicFeeByAmount: report.AuthorizeLoss.Amount, PooledBasicFeeByAmount: report.BasicPooledPriceConsumption.Decimal,
PooledBasicFeeByArea: report.BasicPooledPriceArea.Decimal, PooledBasicFeeByArea: report.BasicPooledPriceArea.Decimal,
AdjustFee: report.AdjustFee, AdjustFee: report.AdjustFee,
PooledAdjustFeeByAmount: report.AdjustPooledPriceConsumption.Decimal, PooledAdjustFeeByAmount: report.AdjustPooledPriceConsumption.Decimal,
PooledAdjustFeeByArea: report.AdjustPooledPriceArea.Decimal, PooledAdjustFeeByArea: report.AdjustPooledPriceArea.Decimal,
Consumption: report.ConsumptionFee.Decimal, Consumption: report.ConsumptionFee.Decimal,
Loss: report.Loss.Decimal, //Loss: report.Loss.Decimal,
LossRate: report.LossFee.Decimal, Loss: report.AuthorizeLoss.Amount,
//LossRate: report.LossFee.Decimal,
LossRate: report.AuthorizeLoss.Proportion,
} }
//copier.Copy(&summaryResponse, report) //copier.Copy(&summaryResponse, report)
return result.Success( return result.Success(

2
repository/report.go
View File

@ -307,7 +307,7 @@ func (rr _ReportRepository) RetrieveReportSummary(rid string) (*model.ReportSumm
Select("*"). Select("*").
Where(goqu.I("report_id").Eq(rid)). Where(goqu.I("report_id").Eq(rid)).
Prepared(true).ToSQL() Prepared(true).ToSQL()
log.Println(">>>>>>>>>>>>>>>.", querySql)
var summary model.ReportSummary var summary model.ReportSummary
if err := pgxscan.Get(ctx, global.DB, &summary, querySql, queryParams...); err != nil { if err := pgxscan.Get(ctx, global.DB, &summary, querySql, queryParams...); err != nil {
rr.log.Error("获取指定报表的总览信息时出现错误", zap.Error(err)) rr.log.Error("获取指定报表的总览信息时出现错误", zap.Error(err))