From 090680391d6c9d51e31d30319ab6d35cc937aaf3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 09 八月 2023 14:42:26 +0800
Subject: [PATCH] 服务合同列表增加关联内容返回

---
 api/v1/serviceContract.go |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/api/v1/serviceContract.go b/api/v1/serviceContract.go
index b9eabf3..7ab6147 100644
--- a/api/v1/serviceContract.go
+++ b/api/v1/serviceContract.go
@@ -7,7 +7,6 @@
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type ServiceContractApi struct{}
@@ -47,17 +46,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
@@ -151,12 +150,12 @@
 
 // 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)
@@ -164,7 +163,7 @@
 		return
 	}
 
-	serviceContracts, errCode := serviceContractService.GetServiceContractList(params.Page, params.PageSize, params.Keyword)
+	serviceContracts, total, errCode := serviceContractService.GetServiceContractList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -172,6 +171,6 @@
 
 	ctx.OkWithDetailed(response.ServiceContractsResponse{
 		List:  serviceContracts,
-		Count: len(serviceContracts),
+		Count: int(total),
 	})
 }

--
Gitblit v1.8.0