forked from free-lancers/electricity_bill_calc_service
		
	enhance(model):增加报表概览中用于保存用户和公共峰谷的字段。
This commit is contained in:
		| @@ -26,8 +26,25 @@ type ReportSummary struct { | |||||||
| 	Loss                           decimal.NullDecimal `xorm:"numeric(14,2)" json:"loss"` | 	Loss                           decimal.NullDecimal `xorm:"numeric(14,2)" json:"loss"` | ||||||
| 	LossFee                        decimal.NullDecimal `xorm:"numeric(16,2)" json:"lossFee"` | 	LossFee                        decimal.NullDecimal `xorm:"numeric(16,2)" json:"lossFee"` | ||||||
| 	CustomerConsumption            decimal.NullDecimal `xorm:"numeric(16,2)" json:"customerConsumption"` | 	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"` | 	PublicConsumption              decimal.NullDecimal `xorm:"numeric(14,2)" json:"publicConsumption"` | ||||||
| 	PublicConsumptionFee           decimal.NullDecimal `xorm:"numeric(14,2)" json:"publicConsumptionFee"` | 	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"` | 	BasicFee                       decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"basicFee"` | ||||||
| 	BasicDilutedPrice              decimal.NullDecimal `xorm:"numeric(18,8)" json:"basicDilutedPrice"` | 	BasicDilutedPrice              decimal.NullDecimal `xorm:"numeric(18,8)" json:"basicDilutedPrice"` | ||||||
| 	AdjustFee                      decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"adjustFee"` | 	AdjustFee                      decimal.Decimal     `xorm:"numeric(14,2) not null default 0" json:"adjustFee"` | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user