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

fix(#5):修复抄表管理页面显示的表计信息多余数据库中的数据

Browse Source
This commit is contained in:
DEKA_123 2023-08-08 13:47:02 +08:00
parent fe7f8bd692
commit ad1b816795
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
global/redis.go
View File

@ -18,8 +18,8 @@ func SetupRedisConnection() error {
a := fmt.Sprintf("%s:%d", config.RedisSettings.Host, config.RedisSettings.Port) a := fmt.Sprintf("%s:%d", config.RedisSettings.Host, config.RedisSettings.Port)
fmt.Println(a) fmt.Println(a)
Rd, err = rueidis.NewClient(rueidis.ClientOption{ Rd, err = rueidis.NewClient(rueidis.ClientOption{
InitAddress: []string{"127.0.0.1:6379"}, InitAddress: []string{"192.168.88.129:6379"},
Password: "", Password: "123456",
SelectDB: config.RedisSettings.DB, SelectDB: config.RedisSettings.DB,
DisableCache: true, DisableCache: true,
}) })

4
repository/meter.go
View File

@ -784,14 +784,14 @@ func (mr _MeterRepository) ListMeterReadings(pid string, keyword *string, page u
readingQuery := mr.ds. readingQuery := mr.ds.
From(goqu.T("meter_reading").As("r")). From(goqu.T("meter_reading").As("r")).
LeftJoin(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("r.meter_id").Eq(goqu.I("m.code")))). LeftJoin(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("r.meter_id").Eq(goqu.I("m.code")), goqu.I("m.park_id").Eq(goqu.I("r.park_id")))).
Select("r.*"). Select("r.*").
Where( Where(
goqu.I("r.park_id").Eq(pid), goqu.I("r.park_id").Eq(pid),
) )
countQuery := mr.ds. countQuery := mr.ds.
From(goqu.T("meter_reading").As("r")). From(goqu.T("meter_reading").As("r")).
LeftJoin(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("r.meter_id").Eq(goqu.I("m.code")))). LeftJoin(goqu.T("meter_04kv").As("m"), goqu.On(goqu.I("r.meter_id").Eq(goqu.I("m.code")), goqu.I("m.park_id").Eq(goqu.I("r.park_id")))).
Select(goqu.COUNT("*")). Select(goqu.COUNT("*")).
Where( Where(
goqu.I("r.park_id").Eq(pid), goqu.I("r.park_id").Eq(pid),