diff --git a/repository/top_up.go b/repository/top_up.go index 1047c11..9597936 100644 --- a/repository/top_up.go +++ b/repository/top_up.go @@ -35,13 +35,13 @@ func (tur _TopUpRepository) ListTopUps(pid string, startDate, endDate *types.Dat topUpQuery := tur.ds. From(goqu.T("tenement_top_ups").As("t")). LeftJoin(goqu.T("tenement").As("te"), goqu.On(goqu.I("te.id").Eq(goqu.I("t.tenement_id")), goqu.I("te.park_id").Eq(goqu.I("t.park_id")))). - LeftJoin(goqu.T("meter").As("m"), goqu.On(goqu.I("m.code").Eq(goqu.I("t.meter_id")), goqu.I("m.park_id").Eq(goqu.I("t.park_id")))). + LeftJoin(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("m.code").Eq(goqu.I("t.meter_id")), goqu.I("m.park_id").Eq(goqu.I("t.park_id")))). Select("t.*", goqu.I("te.full_name").As("tenement_name"), goqu.I("m.address").As("meter_address")). Where(goqu.I("t.park_id").Eq(pid)) countQuery := tur.ds. From(goqu.T("tenement_top_ups").As("t")). LeftJoin(goqu.T("tenement").As("te"), goqu.On(goqu.I("te.id").Eq(goqu.I("t.tenement_id")), goqu.I("te.park_id").Eq(goqu.I("t.park_id")))). - LeftJoin(goqu.T("meter").As("m"), goqu.On(goqu.I("m.code").Eq(goqu.I("t.meter_id")), goqu.I("m.park_id").Eq(goqu.I("t.park_id")))). + LeftJoin(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("m.code").Eq(goqu.I("t.meter_id")), goqu.I("m.park_id").Eq(goqu.I("t.park_id")))). Select(goqu.COUNT("t.*")). Where(goqu.I("t.park_id").Eq(pid))