From 8bf1cad94113d5c604e95e370cf068efdea87d27 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 30 八月 2023 09:43:49 +0800
Subject: [PATCH] fix

---
 api/v1/quotation.go |   65 +++++++++++++++++---------------
 1 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/api/v1/quotation.go b/api/v1/quotation.go
index c76567f..a99f69a 100644
--- a/api/v1/quotation.go
+++ b/api/v1/quotation.go
@@ -7,7 +7,6 @@
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type QuotationApi struct{}
@@ -47,17 +46,17 @@
 //	@Tags		Quotation
 //	@Summary	鍒犻櫎鎶ヤ环鍗�
 //	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.DeleteQuotation true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/quotation/delete/{id} [delete]
+//	@Router		/api/quotation/delete [delete]
 func (s *QuotationApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteQuotation
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := quotationService.DeleteQuotation(id)
+	errCode := quotationService.DeleteQuotation(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -98,30 +97,6 @@
 	ctx.Ok()
 }
 
-// List
-//
-//	@Tags		Quotation
-//	@Summary	鎶ヤ环鍗曞垪琛�
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.QuotationResponse}
-//	@Router		/api/quotation/list [get]
-func (s *QuotationApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-
-	list, errCode := quotationService.GetQuotationList()
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.QuotationResponse{
-		List: list,
-	})
-}
-
 // checkQuotationParams
 func checkQuotationParams(quotation request.Quotation) (int, model.Quotation) {
 	var errCode int
@@ -153,6 +128,8 @@
 		return errCode, quotationModel
 	}
 
+	// 灏嗘椂闂村瓧绗﹁浆鎹负鏃堕棿绫诲瀷
+
 	quotationModel.ValidityDate = t
 	quotationModel.ClientId = quotation.ClientId
 	quotationModel.QuotationStatusId = quotation.QuotationStatusId
@@ -162,7 +139,35 @@
 	quotationModel.ContactId = quotation.ContactId
 	quotationModel.Conditions = quotation.Conditions
 	quotationModel.File = quotation.File
+	quotationModel.Products = quotation.Products
 
 	return ecode.OK, quotationModel
 
 }
+
+// List
+//
+//	@Tags		Quotation
+//	@Summary	鎶ヤ环鍗曞垪琛�
+//	@Produce	application/json
+//	@Param		object	body		request.GetQuotationList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.QuotationResponse}
+//	@Router		/api/quotation/list [post]
+func (con *QuotationApi) List(c *gin.Context) {
+	var params request.GetQuotationList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	quotations, total, errCode := quotationService.GetQuotationList(params.Page, params.PageSize, params.SearchMap)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.QuotationResponse{
+		List:  quotations,
+		Count: int(total),
+	})
+}

--
Gitblit v1.8.0