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

fix(enduser):修正终端用户表计抄表过程中的错误。

Browse Source
This commit is contained in:
徐涛 2022-08-30 11:42:15 +08:00
parent e150a22174
commit 7abf35ca97
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
controller/end_user.go
View File

@ -16,7 +16,7 @@ import (
func InitializeEndUserController(router *gin.Engine) { func InitializeEndUserController(router *gin.Engine) {
router.GET("/report/:rid/submeter", security.EnterpriseAuthorize, fetchEndUserInReport) router.GET("/report/:rid/submeter", security.EnterpriseAuthorize, fetchEndUserInReport)
router.GET("/report/:rid/meter/template", security.EnterpriseAuthorize, downloadEndUserRegisterTemplate) router.GET("/report/:rid/meter/template", downloadEndUserRegisterTemplate)
router.POST("/report/:rid/meter/batch", security.EnterpriseAuthorize, uploadEndUserRegisterTemplate) router.POST("/report/:rid/meter/batch", security.EnterpriseAuthorize, uploadEndUserRegisterTemplate)
router.PUT("/report/:rid/submeter/:pid/:mid", security.EnterpriseAuthorize, modifyEndUserRegisterRecord) router.PUT("/report/:rid/submeter/:pid/:mid", security.EnterpriseAuthorize, modifyEndUserRegisterRecord)
} }
@ -49,9 +49,6 @@ func fetchEndUserInReport(c *gin.Context) {
func downloadEndUserRegisterTemplate(c *gin.Context) { func downloadEndUserRegisterTemplate(c *gin.Context) {
result := response.NewResult(c) result := response.NewResult(c)
requestReportId := c.Param("rid") requestReportId := c.Param("rid")
if !ensureReportBelongs(c, result, requestReportId) {
return
}
users, err := service.EndUserService.AllEndUserRecord(requestReportId) users, err := service.EndUserService.AllEndUserRecord(requestReportId)
if err != nil { if err != nil {
result.NotFound(err.Error()) result.NotFound(err.Error())

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,
nil, "0",
nil, "0",
}, },
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,
nil, "0",
meter.LastPeriodCritical, meter.LastPeriodCritical,
nil, "0",
meter.LastPeriodPeak, meter.LastPeriodPeak,
nil, "0",
meter.LastPeriodValley, meter.LastPeriodValley,
nil, "0",
nil, "0",
nil, "0",
nil, "0",
nil, "0",
}, },
excelize.RowOpts{Height: 15}, excelize.RowOpts{Height: 15},
); err != nil { ); err != nil {

2
service/end_user.go
View File

@ -61,7 +61,7 @@ func (_EndUserService) SearchEndUserRecord(reportId, keyword string, page int) (
Limit(config.ServiceSettings.ItemsPageSize, startItem). Limit(config.ServiceSettings.ItemsPageSize, startItem).
Asc("seq"). Asc("seq").
Find(&endUsers) Find(&endUsers)
cache.CacheSearch(endUsers, []string{"end_user", "report", "park"}, "end_user_detail", conditions...) cache.CacheSearch(endUsers, []string{"end_user_detail", "report", "park"}, "end_user_detail", conditions...)
return endUsers, total, err return endUsers, total, err
} }