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

2
model/park.go
View File

@@ -32,7 +32,7 @@ type Park struct {
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
LastModifiedAt time.Time `json:"lastModifiedAt"` LastModifiedAt time.Time `json:"lastModifiedAt"`
DeletedAt *time.Time `json:"deletedAt"` DeletedAt *time.Time `json:"deletedAt"`
NormAuthorizedLossRate float64 `json:"norm_authorized_loss_rate"` NormAuthorizedLossRate float64 `json:"normAuthorizedLoss"db:"norm_authorized_loss_rate"`
} }
type ParkPeriodStatistics struct { type ParkPeriodStatistics struct {

1
repository/calculate.go
View File

@@ -357,7 +357,6 @@ func (cr _CalculateRepository) SaveReportPublics(tx pgx.Tx, ctx context.Context,
}) })
// 执行插入语句 // 执行插入语句
inserSql, insertArgs, _ := insertExpr.ToSQL() inserSql, insertArgs, _ := insertExpr.ToSQL()
fmt.Println(inserSql)
_, err := tx.Exec(ctx, inserSql, insertArgs...) _, err := tx.Exec(ctx, inserSql, insertArgs...)
if err != nil { if err != nil {
_ = tx.Rollback(ctx) _ = tx.Rollback(ctx)

2
repository/park.go
View File

@@ -38,7 +38,7 @@ func (pr _ParkRepository) ListAllParks(uid string) ([]*model.Park, error) {
"id", "user_id", "name", "area", "tenement_quantity", "capacity", "category", "id", "user_id", "name", "area", "tenement_quantity", "capacity", "category",
"meter_04kv_type", "region", "address", "contact", "phone", "enabled", "price_policy", "tax_rate", "meter_04kv_type", "region", "address", "contact", "phone", "enabled", "price_policy", "tax_rate",
"basic_pooled", "adjust_pooled", "loss_pooled", "public_pooled", "created_at", "last_modified_at", "basic_pooled", "adjust_pooled", "loss_pooled", "public_pooled", "created_at", "last_modified_at",
"deleted_at", "deleted_at","norm_authorized_loss_rate",
). ).
Where( Where(
goqu.I("user_id").Eq(uid), goqu.I("user_id").Eq(uid),

6
service/calculate/tenement.go
View File

@@ -302,11 +302,6 @@ func TenementChargeCalculate(tenements []calculate.PrimaryTenementStatistics,
relatedMeters = append(relatedMeters, meter) 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 overall model.ConsumptionUnit
var critical model.ConsumptionUnit var critical model.ConsumptionUnit
@@ -488,7 +483,6 @@ func TenementChargeCalculate(tenements []calculate.PrimaryTenementStatistics,
Submeters: nil, Submeters: nil,
Poolings: nil, Poolings: nil,
} }
fmt.Println("=====", tenementCharge)
tc = append(tc, tenementCharge) tc = append(tc, tenementCharge)
} }
} }

3
service/calculate/wattCost.go
View File

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