diff --git a/model/end_user_detail.go b/model/end_user_detail.go index fbf65fb..02522d6 100644 --- a/model/end_user_detail.go +++ b/model/end_user_detail.go @@ -114,8 +114,8 @@ type EndUserImport struct { } type EndUserPeriodStat struct { - CustomerName *string `json:"customerName"` - Address *string `json:"address"` + CustomerName string `json:"customerName"` + Address string `json:"address"` MeterId string `bun:"meter_04kv_id" json:"meterId"` IsPublicMeter bool `bun:"public_meter" json:"isPublicMeter"` Kind int8 `bun:"-" json:"pvKind"` diff --git a/service/end_user.go b/service/end_user.go index 60e71da..873a377 100644 --- a/service/end_user.go +++ b/service/end_user.go @@ -450,8 +450,16 @@ func (es _EndUserService) StatEndUserRecordInPeriod(requestUser, requestPark, st return meter.Code == elem.MeterId }) if has { - elem.Address = archive.Address - elem.CustomerName = archive.CustomerName + if archive.Address != nil { + elem.Address = *archive.Address + } else { + elem.Address = "" + } + if archive.CustomerName != nil { + elem.CustomerName = *archive.CustomerName + } else { + elem.CustomerName = "" + } elem.IsPublicMeter = archive.IsPublicMeter elem.Kind = archive.ParkDetail.SubmeterType }