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-07 17:33:38 +08:00
parent 27a499b8cc
commit 69357f77dd
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controller/report.go
View File

@ -96,7 +96,7 @@ func initNewReportCalculateTask(c *fiber.Ctx) error {
if pass, err := checkParkBelongs(form.Park, reportLog, c, &result); !pass { if pass, err := checkParkBelongs(form.Park, reportLog, c, &result); !pass {
return err return err
} }
ok, err := repository.ReportRepository.CreateReport(&form) ok, err := service.ReportService.CreateNewReport(&form)
if err != nil { if err != nil {
reportLog.Error("无法创建核算报表", zap.Error(err)) reportLog.Error("无法创建核算报表", zap.Error(err))
return result.Error(fiber.StatusInternalServerError, "无法创建核算报表。") return result.Error(fiber.StatusInternalServerError, "无法创建核算报表。")
@ -120,7 +120,7 @@ func updateReportCalculateTask(c *fiber.Ctx) error {
reportLog.Error("无法解析更新核算报表的请求数据。", zap.Error(err)) reportLog.Error("无法解析更新核算报表的请求数据。", zap.Error(err))
return result.BadRequest("无法解析更新核算报表的请求数据。") return result.BadRequest("无法解析更新核算报表的请求数据。")
} }
ok, err := repository.ReportRepository.UpdateReportSummary(reportId, &form) ok, err := service.ReportService.UpdateRepoet(reportId, &form)
if err != nil { if err != nil {
reportLog.Error("无法更新核算报表", zap.Error(err)) reportLog.Error("无法更新核算报表", zap.Error(err))
return result.Error(fiber.StatusInternalServerError, "无法更新核算报表。") return result.Error(fiber.StatusInternalServerError, "无法更新核算报表。")

3
go.mod
View File

@ -11,6 +11,7 @@ require (
github.com/jinzhu/copier v0.3.5 github.com/jinzhu/copier v0.3.5
github.com/liamylian/jsontime/v2 v2.0.0 github.com/liamylian/jsontime/v2 v2.0.0
github.com/mozillazg/go-pinyin v0.20.0 github.com/mozillazg/go-pinyin v0.20.0
github.com/pkg/errors v0.9.1
github.com/rueian/rueidis v0.0.100 github.com/rueian/rueidis v0.0.100
github.com/samber/lo v1.38.1 github.com/samber/lo v1.38.1
github.com/shopspring/decimal v1.3.1 github.com/shopspring/decimal v1.3.1
@ -18,6 +19,7 @@ require (
github.com/valyala/fasthttp v1.47.0 github.com/valyala/fasthttp v1.47.0
github.com/xuri/excelize/v2 v2.7.1 github.com/xuri/excelize/v2 v2.7.1
go.uber.org/zap v1.24.0 go.uber.org/zap v1.24.0
golang.org/x/sync v0.2.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/natefinch/lumberjack.v2 v2.2.1
) )
@ -37,7 +39,6 @@ require (
github.com/tinylib/msgp v1.1.8 // indirect github.com/tinylib/msgp v1.1.8 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/tcplisten v1.0.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect
golang.org/x/sync v0.2.0 // indirect
) )
require ( require (

3
service/calculate/checking.go
View File

@ -3,6 +3,7 @@ package calculate
import ( import (
"electricity_bill_calc/model" "electricity_bill_calc/model"
"fmt" "fmt"
"github.com/shopspring/decimal"
"sync/atomic" "sync/atomic"
) )
@ -17,7 +18,7 @@ func CheckMeterArea(report *model.ReportIndex, meters []*model.MeterDetail) (boo
for _, m := range meters { for _, m := range meters {
if (m.MeterType == model.METER_INSTALLATION_TENEMENT || m.MeterType == model.METER_INSTALLATION_POOLING) && if (m.MeterType == model.METER_INSTALLATION_TENEMENT || m.MeterType == model.METER_INSTALLATION_POOLING) &&
m.Area == nil { m.Area.Decimal == decimal.Zero {
atomic.AddInt32(&meterWithoutArea, 1) atomic.AddInt32(&meterWithoutArea, 1)
} }
} }