From 7806f07766600bb94bf1622850bc772e6a0f4056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Mon, 26 Jun 2023 21:52:17 +0800 Subject: [PATCH] =?UTF-8?q?fix(report):=E4=BF=AE=E6=AD=A3=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E8=8E=B7=E5=8F=96=E5=88=86=E6=91=8A=E8=A1=A8?= =?UTF-8?q?=E8=AE=A1=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=BA=94=E8=8E=B7=E5=8F=96=E4=BD=86=E6=9C=AA=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/report.go | 2 +- repository/report.go | 6 +++--- vo/report.go | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/model/report.go b/model/report.go index fb296d2..2acabee 100644 --- a/model/report.go +++ b/model/report.go @@ -80,7 +80,7 @@ type ReportDetailedPublicConsumption struct { type ReportPooledConsumption struct { ReportId string `json:"reportId" db:"report_id"` - MeterId string `json:"parkMeterId" db:"park_meter_id"` + MeterId string `json:"pooledMeterId" db:"pooled_meter_id"` Overall ConsumptionUnit `json:"overall"` Critical ConsumptionUnit `json:"critical"` Peak ConsumptionUnit `json:"peak"` diff --git a/repository/report.go b/repository/report.go index 9cf928f..a157be0 100644 --- a/repository/report.go +++ b/repository/report.go @@ -396,16 +396,16 @@ func (rr _ReportRepository) ListPooledMetersInReport(rid string, page uint, keyw reportQuery := rr.ds. From(goqu.T("report_pooled_consumption").As("r")). - Join(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("m.code").Eq(goqu.I("r.park_meter_id")))). + Join(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("m.code").Eq(goqu.I("r.pooled_meter_id")))). Join(goqu.T("park").As("p"), goqu.On(goqu.I("p.id").Eq(goqu.I("m.park_id")))). LeftJoin(goqu.T("park_building").As("b"), goqu.On(goqu.I("b.id").Eq(goqu.I("m.building")))). Select( - goqu.I("r.*"), goqu.I("b.name").As("building_name"), goqu.I("p.public_pooled"), + goqu.I("r.*"), goqu.I("m.*"), goqu.I("b.name").As("building_name"), goqu.I("p.public_pooled"), ). Where(goqu.I("r.report_id").Eq(rid)) countQuery := rr.ds. From(goqu.T("report_pooled_consumption").As("r")). - Join(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("m.code").Eq(goqu.I("r.park_meter_id")))). + Join(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("m.code").Eq(goqu.I("r.pooled_meter_id")))). Join(goqu.T("park").As("p"), goqu.On(goqu.I("p.id").Eq(goqu.I("m.park_id")))). LeftJoin(goqu.T("park_building").As("b"), goqu.On(goqu.I("b.id").Eq(goqu.I("m.building")))). Select(goqu.COUNT(goqu.I("r.*"))). diff --git a/vo/report.go b/vo/report.go index 941bd15..bd8892c 100644 --- a/vo/report.go +++ b/vo/report.go @@ -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 {