From 1109d0c6565e3413e54d9f28e68dda8ca26b99c4 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 25 七月 2023 11:19:52 +0800
Subject: [PATCH] fix

---
 api/v1/serviceContracts.go |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/api/v1/serviceContracts.go b/api/v1/serviceContracts.go
index a4ad8c5..b04b77d 100644
--- a/api/v1/serviceContracts.go
+++ b/api/v1/serviceContracts.go
@@ -17,7 +17,7 @@
 //	@Tags		ServiceContract
 //	@Summary	娣诲姞鏈嶅姟鍚堝悓
 //	@Produce	application/json
-//	@Param		object	body		request.AddServiceContract true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.AddServiceContract	true	"鏌ヨ鍙傛暟"
 //	@Success	200		{object}	contextx.Response{}
 //	@Router		/api/serviceContract/add [post]
 func (s *ServiceContractApi) Add(c *gin.Context) {
@@ -71,7 +71,7 @@
 //	@Tags		ServiceContract
 //	@Summary	鏇存柊鏈嶅姟鍚堝悓
 //	@Produce	application/json
-//	@Param		object	body		request.UpdateServiceContract true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.UpdateServiceContract	true	"鏌ヨ鍙傛暟"
 //	@Success	200		{object}	contextx.Response{}
 //	@Router		/api/serviceContract/update [put]
 func (s *ServiceContractApi) Update(c *gin.Context) {
@@ -103,7 +103,7 @@
 //	@Tags		ServiceContract
 //	@Summary	鏈嶅姟鍚堝悓鍒楄〃
 //	@Produce	application/json
-//	@Success	200		{object}	contextx.Response{data=response.ServiceContractsResponse}
+//	@Success	200	{object}	contextx.Response{data=response.ServiceContractsResponse}
 //	@Router		/api/serviceContract/list [get]
 func (s *ServiceContractApi) List(c *gin.Context) {
 	ctx, ok := contextx.NewContext(c, nil)
@@ -124,17 +124,17 @@
 
 // check params
 func checkServiceContractParams(serviceContract request.ServiceContract) (errCode int, result model.ServiceContract) {
-	if serviceContract.SignTime == "" {
-		return ecode.InvalidParams, result
-	}
-
-	if serviceContract.Number == "" {
-		return ecode.InvalidParams, result
-	}
-
-	if serviceContract.MemberId <= 0 {
-		return ecode.InvalidParams, result
-	}
+	//if serviceContract.SignTime == "" {
+	//	return ecode.InvalidParams, result
+	//}
+	//
+	//if serviceContract.Number == "" {
+	//	return ecode.InvalidParams, result
+	//}
+	//
+	//if serviceContract.MemberId <= 0 {
+	//	return ecode.InvalidParams, result
+	//}
 
 	t, err := checkTimeFormat(serviceContract.SignTime)
 	if err != nil {
@@ -164,8 +164,8 @@
 	result.ContactId = serviceContract.ContactId
 	result.SaleChanceId = serviceContract.SaleChanceId
 	result.QuotationId = serviceContract.QuotationId
-	result.TypeId = serviceContract.TypeId
-	result.StatusId = serviceContract.StatusId
+	result.ServiceContractTypeId = serviceContract.TypeId
+	result.ServiceContractStatusId = serviceContract.StatusId
 	result.ServiceTimes = serviceContract.ServiceTimes
 	result.Terms = serviceContract.Terms
 	result.Products = serviceContract.Products

--
Gitblit v1.8.0