From 0f15e7b48d064fa6faf99832ca5f4be9bc54e199 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 11 八月 2023 13:41:09 +0800
Subject: [PATCH] fix

---
 api/v1/serviceContract.go |  117 ++++++++++++++++++++++------------------------------------
 1 files changed, 45 insertions(+), 72 deletions(-)

diff --git a/api/v1/serviceContract.go b/api/v1/serviceContract.go
index b04b77d..bd10717 100644
--- a/api/v1/serviceContract.go
+++ b/api/v1/serviceContract.go
@@ -6,8 +6,8 @@
 	"aps_crm/model/response"
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
+	"aps_crm/pkg/structx"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type ServiceContractApi struct{}
@@ -27,13 +27,13 @@
 		return
 	}
 
-	errCode, serviceContract := checkServiceContractParams(params.ServiceContract)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
+	serviceContract := new(model.ServiceContract)
+	if err := structx.AssignTo(params, serviceContract); err != nil {
+		ctx.Fail(ecode.ParamsErr)
 		return
 	}
 
-	errCode = serviceContractService.AddServiceContract(&serviceContract)
+	errCode := serviceContractService.AddServiceContract(serviceContract)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -47,17 +47,17 @@
 //	@Tags		ServiceContract
 //	@Summary	鍒犻櫎鏈嶅姟鍚堝悓
 //	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.DeleteServiceContract true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/serviceContract/delete/{id} [delete]
+//	@Router		/api/serviceContract/delete [delete]
 func (s *ServiceContractApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteServiceContract
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := serviceContractService.DeleteServiceContract(id)
+	errCode := serviceContractService.DeleteServiceContract(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -81,15 +81,15 @@
 		return
 	}
 
-	errCode, serviceContract := checkServiceContractParams(params.ServiceContract)
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
+	serviceContract := new(model.ServiceContract)
+	if err := structx.AssignTo(params, serviceContract); err != nil {
+		ctx.Fail(ecode.ParamsErr)
 		return
 	}
 
 	serviceContract.Id = params.Id
 
-	errCode = serviceContractService.UpdateServiceContract(&serviceContract)
+	errCode := serviceContractService.UpdateServiceContract(serviceContract)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -98,70 +98,13 @@
 	ctx.Ok()
 }
 
-// List
-//
-//	@Tags		ServiceContract
-//	@Summary	鏈嶅姟鍚堝悓鍒楄〃
-//	@Produce	application/json
-//	@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)
-	if !ok {
-		return
-	}
-
-	serviceContracts, errCode := serviceContractService.GetServiceContractList()
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.ServiceContractsResponse{
-		List: serviceContracts,
-	})
-}
-
 // 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
-	//}
-
-	t, err := checkTimeFormat(serviceContract.SignTime)
-	if err != nil {
-		return ecode.InvalidParams, result
-	}
-
-	result.SignTime = t
-
-	t, err = checkTimeFormat(serviceContract.StartTime)
-	if err != nil {
-		return ecode.InvalidParams, result
-	}
-
-	result.StartTime = t
-
-	t, err = checkTimeFormat(serviceContract.EndTime)
-	if err != nil {
-		return ecode.InvalidParams, result
-	}
-
-	result.EndTime = t
-
 	result.Number = serviceContract.Number
 	result.MemberId = serviceContract.MemberId
 	result.Remark = serviceContract.Remark
 	result.ClientId = serviceContract.ClientId
-	result.ContactId = serviceContract.ContactId
+	result.SalesDetailsId = serviceContract.SalesDetailsId
 	result.SaleChanceId = serviceContract.SaleChanceId
 	result.QuotationId = serviceContract.QuotationId
 	result.ServiceContractTypeId = serviceContract.TypeId
@@ -169,6 +112,36 @@
 	result.ServiceTimes = serviceContract.ServiceTimes
 	result.Terms = serviceContract.Terms
 	result.Products = serviceContract.Products
+	result.SignTime = serviceContract.SignTime
+	result.StartTime = serviceContract.StartTime
+	result.EndTime = serviceContract.EndTime
 
 	return ecode.OK, result
 }
+
+// List
+//
+// @Tags   ServiceContract
+// @Summary	鏈嶅姟鍚堝悓鍒楄〃
+// @Produce	application/json
+// @Param		object	body		request.GetServiceContractList	true	"鍙傛暟"
+// @Success	200		{object}	contextx.Response{data=response.ServiceContractsResponse}
+// @Router		/api/serviceContract/list [post]
+func (con *ServiceContractApi) List(c *gin.Context) {
+	var params request.GetServiceContractList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	serviceContracts, total, errCode := serviceContractService.GetServiceContractList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.ServiceContractsResponse{
+		List:  serviceContracts,
+		Count: int(total),
+	})
+}

--
Gitblit v1.8.0