From 2c53a4e2c7ededc1f07324d797430e8d4a0607a1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 15 八月 2023 20:33:41 +0800
Subject: [PATCH] merge
---
api/v1/quotation.go | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/api/v1/quotation.go b/api/v1/quotation.go
index 3a8dd0e..724da4f 100644
--- a/api/v1/quotation.go
+++ b/api/v1/quotation.go
@@ -98,7 +98,6 @@
ctx.Ok()
}
-
// checkQuotationParams
func checkQuotationParams(quotation request.Quotation) (int, model.Quotation) {
var errCode int
@@ -130,6 +129,8 @@
return errCode, quotationModel
}
+ // 灏嗘椂闂村瓧绗﹁浆鎹负鏃堕棿绫诲瀷
+
quotationModel.ValidityDate = t
quotationModel.ClientId = quotation.ClientId
quotationModel.QuotationStatusId = quotation.QuotationStatusId
@@ -159,14 +160,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