forked from free-lancers/electricity_bill_calc_service
		
	enhance(model):增加报表概览中用于保存用户和公共峰谷的字段。
This commit is contained in:
		| @@ -7,34 +7,51 @@ import ( | ||||
| ) | ||||
|  | ||||
| type ReportSummary struct { | ||||
| 	ReportId                      string              `xorm:"varchar(120) pk not null" json:"-"` | ||||
| 	Overall                       decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"overall"` | ||||
| 	OverallFee                    decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"overallFee"` | ||||
| 	OverallPrice                  decimal.NullDecimal `xorm:"numeric(16,8)" json:"overallPrice"` | ||||
| 	Critical                      decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"critical"` | ||||
| 	CriticalFee                   decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"criticalFee"` | ||||
| 	CriticalPrice                 decimal.NullDecimal `xorm:"numeric(16,8)" json:"criticalPrice"` | ||||
| 	Peak                          decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"peak"` | ||||
| 	PeakFee                       decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"peakFee"` | ||||
| 	PeakPrice                     decimal.NullDecimal `xorm:"numeric(16,8)" json:"peakPrice"` | ||||
| 	Flat                          decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"flat"` | ||||
| 	FlatFee                       decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"flatFee"` | ||||
| 	FlatPrice                     decimal.NullDecimal `xorm:"numeric(16,8)" json:"flatPrice"` | ||||
| 	Valley                        decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"valley"` | ||||
| 	ValleyFee                     decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"valleyFee"` | ||||
| 	ValleyPrice                   decimal.NullDecimal `xorm:"numeric(16,8)" json:"valleyPrice"` | ||||
| 	Loss                          decimal.NullDecimal `xorm:"numeric(14,2)" json:"loss"` | ||||
| 	LossFee                       decimal.NullDecimal `xorm:"numeric(16,2)" json:"lossFee"` | ||||
| 	CustomerConsumption           decimal.NullDecimal `xorm:"numeric(16,2)" json:"customerConsumption"` | ||||
| 	PublicConsumption             decimal.NullDecimal `xorm:"numeric(14,2)" json:"publicConsumption"` | ||||
| 	PublicConsumptionFee          decimal.NullDecimal `xorm:"numeric(14,2)" json:"publicConsumptionFee"` | ||||
| 	BasicFee                      decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"basicFee"` | ||||
| 	BasicDilutedPrice             decimal.NullDecimal `xorm:"numeric(18,8)" json:"basicDilutedPrice"` | ||||
| 	AdjustFee                     decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"adjustFee"` | ||||
| 	AdjustDilutedPrice            decimal.NullDecimal `xorm:"numeric(18,8)" json:"adjustDilutedPrice"` | ||||
| 	MaintenanceDilutedPrice       decimal.NullDecimal `xorm:"numeric(16,8)" json:"maintencanceDilutedPrice"` | ||||
| 	LossDilutedPrice              decimal.NullDecimal `xorm:"numeric(16,8)" json:"lossDilutedPrice"` | ||||
| 	PublicConsumptionDilutedPrice decimal.NullDecimal `xorm:"numeric(16,8)" json:"publicConsumptionDilutedPrice"` | ||||
| 	ReportId                       string              `xorm:"varchar(120) pk not null" json:"-"` | ||||
| 	Overall                        decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"overall"` | ||||
| 	OverallFee                     decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"overallFee"` | ||||
| 	OverallPrice                   decimal.NullDecimal `xorm:"numeric(16,8)" json:"overallPrice"` | ||||
| 	Critical                       decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"critical"` | ||||
| 	CriticalFee                    decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"criticalFee"` | ||||
| 	CriticalPrice                  decimal.NullDecimal `xorm:"numeric(16,8)" json:"criticalPrice"` | ||||
| 	Peak                           decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"peak"` | ||||
| 	PeakFee                        decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"peakFee"` | ||||
| 	PeakPrice                      decimal.NullDecimal `xorm:"numeric(16,8)" json:"peakPrice"` | ||||
| 	Flat                           decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"flat"` | ||||
| 	FlatFee                        decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"flatFee"` | ||||
| 	FlatPrice                      decimal.NullDecimal `xorm:"numeric(16,8)" json:"flatPrice"` | ||||
| 	Valley                         decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"valley"` | ||||
| 	ValleyFee                      decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"valleyFee"` | ||||
| 	ValleyPrice                    decimal.NullDecimal `xorm:"numeric(16,8)" json:"valleyPrice"` | ||||
| 	Loss                           decimal.NullDecimal `xorm:"numeric(14,2)" json:"loss"` | ||||
| 	LossFee                        decimal.NullDecimal `xorm:"numeric(16,2)" json:"lossFee"` | ||||
| 	CustomerConsumption            decimal.NullDecimal `xorm:"numeric(16,2)" json:"customerConsumption"` | ||||
| 	CustomerConsumptionFee         decimal.NullDecimal `xorm:"numeric(14,2)" json:"customerConsumptionFee"` | ||||
| 	CustomerConsumptionCritical    decimal.NullDecimal `xorm:"numeric(16,2)" json:"customerConsumptionCritical"` | ||||
| 	CustomerConsumptionCriticalFee decimal.NullDecimal `xorm:"numeric(14,2)" json:"customerConsumptionCriticalFee"` | ||||
| 	CustomerConsumptionPeak        decimal.NullDecimal `xorm:"numeric(16,2)" json:"customerConsumptionPeak"` | ||||
| 	CustomerConsumptionPeakFee     decimal.NullDecimal `xorm:"numeric(14,2)" json:"customerConsumptionPeakFee"` | ||||
| 	CustomerConsumptionFlat        decimal.NullDecimal `xorm:"numeric(16,2)" json:"customerConsumptionFlat"` | ||||
| 	CustomerConsumptionFlatFee     decimal.NullDecimal `xorm:"numeric(14,2)" json:"customerConsumptionFlatFee"` | ||||
| 	CustomerConsumptionValley      decimal.NullDecimal `xorm:"numeric(16,2)" json:"customerConsumptionValley"` | ||||
| 	CustomerConsumptionValleyFee   decimal.NullDecimal `xorm:"numeric(14,2)" json:"customerConsumptionValleyFee"` | ||||
| 	PublicConsumption              decimal.NullDecimal `xorm:"numeric(14,2)" json:"publicConsumption"` | ||||
| 	PublicConsumptionFee           decimal.NullDecimal `xorm:"numeric(14,2)" json:"publicConsumptionFee"` | ||||
| 	PublicConsumptionCriticalFee   decimal.NullDecimal `xorm:"numeric(14,2)" json:"publicConsumptionCriticalFee"` | ||||
| 	PublicConsumptionPeak          decimal.NullDecimal `xorm:"numeric(16,2)" json:"publicConsumptionPeak"` | ||||
| 	PublicConsumptionPeakFee       decimal.NullDecimal `xorm:"numeric(14,2)" json:"publicConsumptionPeakFee"` | ||||
| 	PublicConsumptionCritical      decimal.NullDecimal `xorm:"numeric(16,2)" json:"publicConsumptionCritical"` | ||||
| 	PublicConsumptionFlat          decimal.NullDecimal `xorm:"numeric(16,2)" json:"publicConsumptionFlat"` | ||||
| 	PublicConsumptionFlatFee       decimal.NullDecimal `xorm:"numeric(14,2)" json:"publicConsumptionFlatFee"` | ||||
| 	PublicConsumptionValley        decimal.NullDecimal `xorm:"numeric(16,2)" json:"publicConsumptionValley"` | ||||
| 	PublicConsumptionValleyFee     decimal.NullDecimal `xorm:"numeric(14,2)" json:"publicConsumptionValleyFee"` | ||||
| 	BasicFee                       decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"basicFee"` | ||||
| 	BasicDilutedPrice              decimal.NullDecimal `xorm:"numeric(18,8)" json:"basicDilutedPrice"` | ||||
| 	AdjustFee                      decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"adjustFee"` | ||||
| 	AdjustDilutedPrice             decimal.NullDecimal `xorm:"numeric(18,8)" json:"adjustDilutedPrice"` | ||||
| 	MaintenanceDilutedPrice        decimal.NullDecimal `xorm:"numeric(16,8)" json:"maintencanceDilutedPrice"` | ||||
| 	LossDilutedPrice               decimal.NullDecimal `xorm:"numeric(16,8)" json:"lossDilutedPrice"` | ||||
| 	PublicConsumptionDilutedPrice  decimal.NullDecimal `xorm:"numeric(16,8)" json:"publicConsumptionDilutedPrice"` | ||||
| } | ||||
|  | ||||
| func (ReportSummary) TableName() string { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user