From 9d131465500ca1a135f63c3e338726075fcd957d Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期五, 25 八月 2023 17:55:10 +0800 Subject: [PATCH] fix --- api/v1/test/contract.go | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/api/v1/test/contract.go b/api/v1/test/contract.go index 886bab3..b47a1eb 100644 --- a/api/v1/test/contract.go +++ b/api/v1/test/contract.go @@ -9,6 +9,7 @@ "github.com/flipped-aurora/gin-vue-admin/server/service" "github.com/gin-gonic/gin" "go.uber.org/zap" + "strconv" ) type ContractApi struct { @@ -184,22 +185,41 @@ // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query testReq.ContractSearch true "棰勮Contract" +// @Param data query test.Contract true "鐢╥d鏌ヨContract" // @Success 200 {string} string "{"success":true,"data":{},"msg":"棰勮鎴愬姛"}" // @Router /con/previewContract [get] func (conApi *ContractApi) PreviewContract(c *gin.Context) { - var pageInfo testReq.ContractSearch - err := c.ShouldBindQuery(&pageInfo) + var con test.Contract + err := c.ShouldBindQuery(&con) if err != nil { response.FailWithMessage(err.Error(), c) return } - contract, err := conService.GetContract(pageInfo.ID) + + id := c.Query("id") + if id == "" { + response.FailWithMessage("id涓嶈兘涓虹┖", c) + return + } + + val64, err := strconv.ParseUint(id, 10, 64) + if err != nil { + response.FailWithMessage("id鏍煎紡閿欒", c) + return + } + + // Convert uint64 to uint + conId := uint(val64) + + contract, err := conService.GetContract(conId) if err != nil { global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err)) response.FailWithMessage("鑾峰彇澶辫触", c) return } else { - c.Data(200, "application/pdf", contract.FileContent) + //c.Writer.Header().Set("Content-Type", "application/octect-stream") + //c.Writer.Header().Set("Content-Disposition", "attachment;filename="+contract.FileName) + //c.Writer.Write(contract.FileContent) + c.Data(200, "application/octect-stream", contract.FileContent) } } -- Gitblit v1.8.0