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

enhance(enduser):导出抄表记录模板中携带有已经保存在系统中的抄表数据。

Browse Source
This commit is contained in:
徐涛 2022-09-13 16:00:41 +08:00
parent 85b9890168
commit a8430e012f
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
excel/meter_non_pv_template.go
View File

@ -75,8 +75,8 @@ func (t *MeterNonPVExcelTemplateGenerator) WriteMeterData(meters []model.EndUser
meter.MeterId, meter.MeterId,
meter.Ratio, meter.Ratio,
meter.LastPeriodOverall, meter.LastPeriodOverall,
"0", meter.CurrentPeriodOverall,
"0", meter.AdjustOverall,
}, },
excelize.RowOpts{Height: 15}, excelize.RowOpts{Height: 15},
); err != nil { ); err != nil {

16
excel/meter_pv_template.go
View File

@ -84,17 +84,17 @@ func (t *MeterPVExcelTemplateGenerator) WriteMeterData(meters []model.EndUserDet
meter.MeterId, meter.MeterId,
meter.Ratio, meter.Ratio,
meter.LastPeriodOverall, meter.LastPeriodOverall,
"0", meter.CurrentPeriodOverall,
meter.LastPeriodCritical, meter.LastPeriodCritical,
"0", meter.CurrentPeriodCritical,
meter.LastPeriodPeak, meter.LastPeriodPeak,
"0", meter.CurrentPeriodPeak,
meter.LastPeriodValley, meter.LastPeriodValley,
"0", meter.CurrentPeriodValley,
"0", meter.AdjustOverall,
"0", meter.AdjustCritical,
"0", meter.AdjustPeak,
"0", meter.AdjustValley,
}, },
excelize.RowOpts{Height: 15}, excelize.RowOpts{Height: 15},
); err != nil { ); err != nil {

2
service/end_user.go
View File

@ -78,7 +78,7 @@ func (_EndUserService) AllEndUserRecord(reportId string) ([]model.EndUserDetail,
users := make([]model.EndUserDetail, 0) users := make([]model.EndUserDetail, 0)
err := global.DBConn. err := global.DBConn.
Where(builder.Eq{"report_id": reportId}). Where(builder.Eq{"report_id": reportId}).
Asc("seq"). Asc("seq", "meter_04kv_id").
Find(&users) Find(&users)
cache.CacheSearch(users, []string{"end_user_detail", "report", "park"}, "end_user_detail", "report", reportId) cache.CacheSearch(users, []string{"end_user_detail", "report", "park"}, "end_user_detail", "report", reportId)
return users, err return users, err