fix(tenement): 解决向园区中指定商户下绑定一个新的表计时时间异常问题

This commit is contained in:
2023-08-10 09:32:38 +08:00
parent 7f46f2f36b
commit 3d918eea85
4 changed files with 9 additions and 11 deletions

View File

@@ -4,7 +4,6 @@ import (
"electricity_bill_calc/model"
"electricity_bill_calc/model/calculate"
"electricity_bill_calc/repository"
"fmt"
"github.com/shopspring/decimal"
"time"
"unsafe"
@@ -25,7 +24,6 @@ func PooledMetersCalculate(report *model.ReportIndex, periodStart time.Time,
}
poolingMeterReadings = append(poolingMeterReadings, lastTermPoolingMeterReadings...)
fmt.Println(poolingMeterReadings, "==============================================")
if len(poolingMeterReadings) <= 0 {
return nil, nil
}

View File

@@ -55,7 +55,7 @@ func MainCalculateProcess(rid string) error {
fmt.Println("7", err)
return err
}
fmt.Println(meterDetails,"看看是不是为空的")
// 获取所有的物业表计,然后对所有的物业表计电量进行计算。
parkMetersReports, err := MetersParkCalculate(*report, periodStart.Time, periodEnd.Time, meterDetails, summary)
if err != nil {
@@ -67,11 +67,11 @@ func MainCalculateProcess(rid string) error {
parkTotal := TotalConsumptionCalculate(tenementReports, summary)
//计算线损以及调整线损
//err = LossCalculate(report, parkMetersReports, &parkTotal, &summary)
//if err != nil {
// fmt.Println("9", err)
// return err
//}
err = LossCalculate(report, parkMetersReports, &parkTotal, &summary)
if err != nil {
fmt.Println("9", err)
return err
}
fmt.Println(parkTotal)
// 计算所有已经启用的商铺面积总和,仅计算所有未迁出的商户的所有表计对应的商铺面积。