enhance(enduser):终端用户统计部分增加终端用户表计类型。

model/end_user_detail.go

@@ -118,6 +118,7 @@ type EndUserPeriodStat struct {
 	Address          string              `json:"address"`
 	MeterId          string              `bun:"meter_04kv_id" json:"meterId"`
 	IsPublicMeter    bool                `bun:"public_meter" json:"isPublicMeter"`
+	Kind             int8                `bun:"-" json:"pvKind"`
 	Overall          decimal.NullDecimal `json:"overall"`
 	Critical         decimal.NullDecimal `json:"critical"`
 	Peak             decimal.NullDecimal `json:"peak"`

service/end_user.go

@@ -435,7 +435,7 @@ func (es _EndUserService) StatEndUserRecordInPeriod(requestUser, requestPark, st
 	)
 	meterArchives := make([]model.Meter04KV, 0)
 	if len(meterIds.ToSlice()) > 0 {
-		err = global.DB.NewSelect().Model(&meterArchives).
+		err = global.DB.NewSelect().Model(&meterArchives).Relation("ParkDetail").
 			Where("code in (?)", bun.In(meterIds.ToSlice())).
 			Scan(ctx)
 		if err != nil {
@@ -452,6 +452,7 @@ func (es _EndUserService) StatEndUserRecordInPeriod(requestUser, requestPark, st
 				elem.Address = *archive.Address
 				elem.CustomerName = *archive.CustomerName
 				elem.IsPublicMeter = archive.IsPublicMeter
+				elem.Kind = archive.ParkDetail.SubmeterType
 			}
 			if !elem.Overall.Decimal.IsZero() {
 				elem.AdjustProportion = decimal.NewNullDecimal(