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

enhance(report):批量导入预置的维护费功能，会提前删除之前导入的内容。

Browse Source
This commit is contained in:
徐涛 2022-08-21 21:31:10 +08:00
parent ea929fd106
commit f7c639cba0
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/report.go
View File

@ -291,7 +291,7 @@ func importPredefinedMaintenanceFees(c *gin.Context) {
return *fee
},
)
err = service.ReportService.BatchSaveMaintenanceFee(dilutedFees)
err = service.ReportService.BatchSaveMaintenanceFee(report.Id, dilutedFees)
if err != nil {
result.Error(http.StatusInternalServerError, err.Error())
return

12
service/report.go
View File

@ -220,13 +220,21 @@ func (_ReportService) CreateTemporaryWillDilutedMaintenanceFee(fee model.WillDil
return err
}
func (_ReportService) BatchSaveMaintenanceFee(fees []model.WillDilutedFee) error {
func (_ReportService) BatchSaveMaintenanceFee(reportId string, fees []model.WillDilutedFee) error {
tx := global.DBConn.NewSession()
if err := tx.Begin(); err != nil {
return err
}
defer tx.Close()
_, err := tx.Insert(fees)
// 首先删除所有预定义的部分，条件是指定报表ID，SourceID不为空。
cond := builder.Eq{"report_id": reportId}.And(builder.NotNull{"source_id"})
_, err := tx.Table(new(model.WillDilutedFee)).Where(cond).Delete()
if err != nil {
tx.Rollback()
return err
}
// 然后插入新的记录
_, err = tx.Insert(fees)
if err != nil {
return err
}