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

fix(park): 修复创建报表中核定线损未显示问题

Browse Source
This commit is contained in:
ZiHangQin
2023-08-15 15:13:10 +08:00
parent eaf45331f1
commit 59a604bab0
5 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/calculate/tenement.go
View File

@@ -302,11 +302,6 @@ func TenementChargeCalculate(tenements []calculate.PrimaryTenementStatistics,
relatedMeters = append(relatedMeters, meter)
}
}
fmt.Println("---", relatedMeters[0].Valley)
fmt.Println("---", relatedMeters[0].Flat)
fmt.Println("---", relatedMeters[0].Peak)
fmt.Println("---", relatedMeters[0].Overall)
fmt.Println("---", relatedMeters[0].Critical)
// 计算商户的合计电费信息
var overall model.ConsumptionUnit
var critical model.ConsumptionUnit
@@ -488,7 +483,6 @@ func TenementChargeCalculate(tenements []calculate.PrimaryTenementStatistics,
Submeters: nil,
Poolings: nil,
}
fmt.Println("=====", tenementCharge)
tc = append(tc, tenementCharge)
}
}

3
service/calculate/wattCost.go
View File

@@ -20,6 +20,7 @@ func MainCalculateProcess(rid string) error {
return err
}
fmt.Println(report, reportSummary)
summary := calculate.FromReportSummary(reportSummary, report)
periodStart := report.Period.SafeLower()
@@ -85,7 +86,7 @@ func MainCalculateProcess(rid string) error {
fmt.Println("11", err)
return err
}
fmt.Println("计算数据读取完成")
fmt.Println("计算数据读取完成=======================================================================================================================================================================================")
// 收集目前所有已经处理的表计，统一对其进行摊薄计算。
meters, err := CollectMeters(tenementReports, poolingMetersReports, parkMetersReports)
if err != nil {