enhance(enduser):基本完成终端用户表计在一个时间阶段内的统计功能。

model/end_user_detail.go

@@ -56,6 +56,8 @@ type EndUserDetail struct {
 	FinalCharge           decimal.NullDecimal `bun:"type:numeric" json:"finalCharge"`
 	Initialize            bool                `bun:"-" json:"-"`
 	Origin                *Meter04KV          `bun:"rel:belongs-to,join:park_id=park_id,join:meter_04kv_id=code" json:"-"`
+	Report                *Report             `bun:"rel:belongs-to,join:report_id=id" json:"-"`
+	Park                  *Park               `bun:"rel:belongs-to,join:park_id=id" json:"-"`
 }
 
 var _ bun.BeforeAppendModelHook = (*EndUserDetail)(nil)
@@ -110,3 +112,20 @@ type EndUserImport struct {
 	AdjustFlat            decimal.NullDecimal `excel:"adjustFlat"`
 	AdjustValley          decimal.NullDecimal `excel:"adjustValley"`
 }
+
+type EndUserPeriodStat struct {
+	CustomerName     string              `json:"customerName"`
+	Address          string              `json:"address"`
+	MeterId          string              `bun:"meter_04kv_id" json:"meterId"`
+	IsPublicMeter    bool                `bun:"public_meter" json:"isPublicMeter"`
+	Overall          decimal.NullDecimal `json:"overall"`
+	Critical         decimal.NullDecimal `json:"critical"`
+	Peak             decimal.NullDecimal `json:"peak"`
+	Valley           decimal.NullDecimal `json:"valley"`
+	OverallFee       decimal.NullDecimal `json:"overallFee"`
+	CriticalFee      decimal.NullDecimal `json:"criticalFee"`
+	PeakFee          decimal.NullDecimal `json:"peakFee"`
+	ValleyFee        decimal.NullDecimal `json:"valleyFee"`
+	AdjustFee        decimal.NullDecimal `bun:"final_diluted" json:"adjustFee"`
+	AdjustProportion decimal.NullDecimal `bun:"-" json:"adjustProportion"`
+}

model/meter_04kv.go

@@ -20,7 +20,6 @@ type Meter04KV struct {
 	Ratio              decimal.Decimal `bun:"type:numeric,notnull" json:"ratio" excel:"ratio"`
 	Seq                int64           `bun:"type:bigint,notnull" json:"seq" excel:"seq"`
 	IsPublicMeter      bool            `bun:"public_meter,notnull" json:"isPublicMeter" excel:"public"`
-	WillDilute         bool            `bun:"dilute,notnull" json:"willDilute" excel:"dilute"`
 	Enabled            bool            `bun:",notnull" json:"enabled"`
 	ParkDetail         *Park           `bun:"rel:belongs-to,join:park_id=id" json:"-"`
 }

model/types.go

@@ -29,7 +29,7 @@ func NewEmptyDate() Date {
 		panic(err)
 	}
 	return Date{
-		Time: time.Date(2000, 1, 1, 0, 0, 0, 0, loc),
+		Time: time.Time{}.In(loc),
 	}
 }
 
@@ -47,6 +47,18 @@ func ParseDate(t string) (Date, error) {
 	}, nil
 }
 
+func (d Date) IsEmpty() bool {
+	return d.Time.IsZero()
+}
+
+func (d Date) Format(fmt string) string {
+	return d.Time.Format(fmt)
+}
+
+func (d Date) ToString() string {
+	return d.Time.Format("2006-01-02")
+}
+
 var _ driver.Valuer = (*Date)(nil)
 
 func (d Date) Value() (driver.Value, error) {