enhance(report):在初始化报表的时候,一并初始化园区电量概要。

This commit is contained in:
徐涛 2022-08-20 16:15:17 +08:00
parent b2126a534b
commit 738472a5fb
2 changed files with 24 additions and 9 deletions

View File

@ -1,7 +1,6 @@
package controller
import (
"electricity_bill_calc/model"
"electricity_bill_calc/response"
"electricity_bill_calc/security"
"electricity_bill_calc/service"
@ -64,8 +63,7 @@ func initializeNewReport(c *gin.Context) {
result.NotAccept("只能初始化已发布报表下一个月份的新报表。")
return
}
newReport := model.Report{ParkId: requestParkId, Period: reportPeriod}
err = service.ReportService.InitializeNewReport(newReport)
err = service.ReportService.InitializeNewReport(requestParkId, reportPeriod)
if err != nil {
result.Error(http.StatusInternalServerError, err.Error())
return

View File

@ -104,13 +104,30 @@ func (_ReportService) IsNewPeriodValid(uid string, period time.Time) (bool, erro
}
}
func (_ReportService) InitializeNewReport(report model.Report) (err error) {
report.Id = uuid.New().String()
report.StepState = model.NewSteps()
report.Published = false
report.Withdraw = model.REPORT_NOT_WITHDRAW
_, err = global.DBConn.Insert(report)
func (_ReportService) InitializeNewReport(parkId string, period time.Time) (err error) {
newReport := model.Report{
Id: uuid.New().String(),
ParkId: parkId,
StepState: model.NewSteps(),
Published: false,
Withdraw: model.REPORT_NOT_WITHDRAW,
}
newReportSummary := model.ReportSummary{
ReportId: newReport.Id,
}
tx := global.DBConn.NewSession()
if err = tx.Begin(); err != nil {
return
}
defer tx.Close()
_, err = tx.Insert(newReport, newReportSummary)
if err != nil {
tx.Rollback()
return
}
err = tx.Commit()
if err != nil {
tx.Rollback()
return
}
return nil