ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

fix(report): 修复核算报表中园区获取错误

Browse Source
This commit is contained in:
ZiHangQin
2023-08-09 09:18:51 +08:00
parent ed5a3f6c0a
commit b59e24333e
2 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
model/park.go
View File

@@ -9,34 +9,30 @@ import (
) )
type Park struct { type Park struct {
Id string `json:"id"` Id string `json:"id"`
UserId string `json:"userId"` UserId string `json:"userId"`
Name string `json:"name"` Name string `json:"name"`
Abbr string `json:"-"` Abbr string `json:"-"`
Area decimal.NullDecimal `json:"area"` Area decimal.NullDecimal `json:"area"`
TenementQuantity decimal.NullDecimal `json:"tenement"` TenementQuantity decimal.NullDecimal `json:"tenement"`
Capacity decimal.NullDecimal `json:"capacity"` Capacity decimal.NullDecimal `json:"capacity"`
Category int16 `json:"category"` Category int16 `json:"category"`
MeterType int16 `json:"meter04kvType" db:"meter_04kv_type"` MeterType int16 `json:"meter04kvType" db:"meter_04kv_type"`
PricePolicy int16 `json:"pricePolicy"` PricePolicy int16 `json:"pricePolicy"`
BasicPooled int16 `json:"basicDiluted"` BasicPooled int16 `json:"basicDiluted"`
AdjustPooled int16 `json:"adjustDiluted"` AdjustPooled int16 `json:"adjustDiluted"`
LossPooled int16 `json:"lossDiluted"` LossPooled int16 `json:"lossDiluted"`
PublicPooled int16 `json:"publicDiluted"` PublicPooled int16 `json:"publicDiluted"`
TaxRate decimal.NullDecimal `json:"taxRate"` TaxRate decimal.NullDecimal `json:"taxRate"`
Region *string `json:"region"` Region *string `json:"region"`
Address *string `json:"address"` Address *string `json:"address"`
Contact *string `json:"contact"` Contact *string `json:"contact"`
Phone *string `json:"phone"` Phone *string `json:"phone"`
Enabled bool `json:"enabled"` Enabled bool `json:"enabled"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
LastModifiedAt time.Time `json:"lastModifiedAt"` LastModifiedAt time.Time `json:"lastModifiedAt"`
DeletedAt *time.Time `json:"deletedAt"` DeletedAt *time.Time `json:"deletedAt"`
} NormAuthorizedLossRate float64 `json:"norm_authorized_loss_rate"`
type Parks struct {
Park
NormAuthorizedLossRate float64 `json:"norm_authorized_loss_rate"`
} }
type ParkPeriodStatistics struct { type ParkPeriodStatistics struct {

4
settings.yaml
View File

@@ -12,9 +12,9 @@ Server:
ReadTimeout: 60 ReadTimeout: 60
WriteTimeout: 60 WriteTimeout: 60
Redis: Redis:
Host: 192.168.88.129 Host: 127.0.0.1
Port: 6379 Port: 6379
Password: 123456 Password:
DB: 1 DB: 1
Service: Service:
MaxSessionLife: 2h MaxSessionLife: 2h