From 5525c3c9de0fd6a6e2536b6d7bf1f55c153b5e21 Mon Sep 17 00:00:00 2001 From: skeris Date: Sat, 18 May 2024 00:15:11 +0300 Subject: [PATCH] fix: report.docx --- .~lock.report.docx# | 1 + internal/interface/swagger/api.2.go | 13 ++++++++++--- internal/models/templategen.go | 1 + report.docx | Bin 8245 -> 8195 bytes 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .~lock.report.docx# diff --git a/.~lock.report.docx# b/.~lock.report.docx# new file mode 100644 index 0000000..bea0197 --- /dev/null +++ b/.~lock.report.docx# @@ -0,0 +1 @@ +,skeris,skeris-notebook,18.05.2024 00:31,file:///home/skeris/.config/libreoffice/4; \ No newline at end of file diff --git a/internal/interface/swagger/api.2.go b/internal/interface/swagger/api.2.go index b53302b..7ee99a4 100644 --- a/internal/interface/swagger/api.2.go +++ b/internal/interface/swagger/api.2.go @@ -796,18 +796,25 @@ func (api *API2) SendReport(ctx echo.Context) error { for _, tariff := range tariffs.RawDetails.Tariffs { totalAmount := uint64(0) + privilegeMeasurement := "" + piecePrice := "" + privilegeName := "" for _, privilege := range tariff.Privileges { totalAmount += privilege.Amount + privilegeMeasurement = string(privilege.Type) + piecePrice = fmt.Sprintf("%.2f",float64(privilege.Price)/100) + privilegeName = privilege.Name } data := models.RespGeneratorService{ DocNumber: fmt.Sprint(historyMap[req.Id] + 1), Date: time.Now().Format("2006-01-02"), OrgTaxNum: verifuser.TaxNumber, OrgName: account.Name.Orgname, - Name: tariff.Name, + Name: tariff.Name + " " + privilegeName, Amount: fmt.Sprint(totalAmount), - Price: fmt.Sprint(tariffs.RawDetails.Price), - Sum: fmt.Sprint(tariffs.RawDetails.Price), + Unit: piecePrice, + Price: fmt.Sprintf("%.2f",float64(tariffs.RawDetails.Price)/100), + Sum: privilegeMeasurement, } err = api.clients.template.SendData(ctx.Request().Context(), data, fileContents, authuser.Login) if err != nil { diff --git a/internal/models/templategen.go b/internal/models/templategen.go index d584810..4d293db 100644 --- a/internal/models/templategen.go +++ b/internal/models/templategen.go @@ -9,4 +9,5 @@ type RespGeneratorService struct { Amount string `json:"amount"` Price string `json:"price"` Sum string `json:"sum"` + Unit string `json:"unit"` } diff --git a/report.docx b/report.docx index 40b88ce34ca9edb0181fd924557cf112538297ac..16cfff2d9aa37b6947cc9e2ee6ecf7ed39d6f4bf 100644 GIT binary patch delta 3440 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 D32yQ} delta 3464 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