From 5fa1de02759b9646e8987312736699755990e960 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 13 十月 2023 15:30:22 +0800
Subject: [PATCH] bug修改

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

diff --git a/api/v1/quotation.go b/api/v1/quotation.go
index 3a8dd0e..a26d4e9 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{}
@@ -39,6 +38,14 @@
 		return
 	}
 
+	if params.CodeRule.Method == 1 {
+		autoCode := model.GetAutoCode(quotation.Id, &params.CodeRule)
+		m := map[string]interface{}{
+			"number": autoCode,
+		}
+		_ = model.NewQuotationSearch(nil).SetId(quotation.Id).Updates(m)
+	}
+
 	ctx.Ok()
 }
 
@@ -47,17 +54,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,7 +105,6 @@
 	ctx.Ok()
 }
 
-
 // checkQuotationParams
 func checkQuotationParams(quotation request.Quotation) (int, model.Quotation) {
 	var errCode int
@@ -130,6 +136,8 @@
 		return errCode, quotationModel
 	}
 
+	// 灏嗘椂闂村瓧绗﹁浆鎹负鏃堕棿绫诲瀷
+
 	quotationModel.ValidityDate = t
 	quotationModel.ClientId = quotation.ClientId
 	quotationModel.QuotationStatusId = quotation.QuotationStatusId
@@ -139,6 +147,8 @@
 	quotationModel.ContactId = quotation.ContactId
 	quotationModel.Conditions = quotation.Conditions
 	quotationModel.File = quotation.File
+	quotationModel.Products = quotation.Products
+	quotationModel.CodeStandID = quotation.CodeStandID
 
 	return ecode.OK, quotationModel
 
@@ -159,14 +169,14 @@
 		return
 	}
 
-	quotations, total, errCode := quotationService.GetQuotationList(params.Page, params.PageSize, params.Keyword)
+	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,
+		List:  quotations,
 		Count: int(total),
 	})
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0