From 0409a5d0235f4a87ecf08b12baa9149279a90447 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 22:25:58 +0800
Subject: [PATCH] fix

---
 api/v1/serviceContract.go |  127 ++++++++++++++++-------------------------
 1 files changed, 50 insertions(+), 77 deletions(-)

diff --git a/api/v1/serviceContract.go b/api/v1/serviceContract.go
index 52b188f..012aa4b 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{}
@@ -26,13 +26,14 @@
 	if !ok {
 		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
@@ -41,22 +42,45 @@
 	ctx.Ok()
 }
 
-// Delete
+//// Delete
+////
+////	@Tags		ServiceContract
+////	@Summary	鍒犻櫎鏈嶅姟鍚堝悓
+////	@Produce	application/json
+////	@Param		object	body		request.DeleteServiceContract true	"鏌ヨ鍙傛暟"
+////	@Success	200	{object}	contextx.Response{}
+////	@Router		/api/serviceContract/delete [delete]
+//func (s *ServiceContractApi) Delete(c *gin.Context) {
+//	var params request.DeleteServiceContract
+//	ctx, ok := contextx.NewContext(c, &params)
+//	if !ok {
+//		return
+//	}
 //
-//	@Tags		ServiceContract
-//	@Summary	鍒犻櫎鏈嶅姟鍚堝悓
-//	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
-//	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/serviceContract/delete/{id} [delete]
-func (s *ServiceContractApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+//	errCode := serviceContractService.DeleteServiceContract(params.Ids)
+//	if errCode != ecode.OK {
+//		ctx.Fail(errCode)
+//		return
+//	}
+//
+//	ctx.Ok()
+//}
+
+// BatchDelete
+// @Tags	ServiceContract
+// @Summary	鎵归噺鍒犻櫎鏈嶅姟鍚堝悓
+// @Produce	application/json
+// @Param	object	body request.CommonIds	true "鍙傛暟"
+// @Success	200	{object}	contextx.Response{}
+// @Router		/api/serviceContract/delete [delete]
+func (s *ServiceContractApi) BatchDelete(c *gin.Context) {
+	var params request.CommonIds
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := serviceContractService.DeleteServiceContract(id)
+	errCode := serviceContractService.BatchDeleteServiceContract(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -80,15 +104,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
@@ -97,65 +121,14 @@
 	ctx.Ok()
 }
 
-// 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.SaleChanceId = serviceContract.SaleChanceId
-	result.QuotationId = serviceContract.QuotationId
-	result.ServiceContractTypeId = serviceContract.TypeId
-	result.ServiceContractStatusId = serviceContract.StatusId
-	result.ServiceTimes = serviceContract.ServiceTimes
-	result.Terms = serviceContract.Terms
-	result.Products = serviceContract.Products
-
-	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]
+// @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)

--
Gitblit v1.8.0