From b0c07ddee23e2d54d03636f08af19f0934857cf4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 25 八月 2023 10:32:56 +0800
Subject: [PATCH] Merge branch 'hotfix'

---
 api/v1/contract.go |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/api/v1/contract.go b/api/v1/contract.go
index ebd4cf2..ff42186 100644
--- a/api/v1/contract.go
+++ b/api/v1/contract.go
@@ -7,7 +7,6 @@
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type ContractApi struct{}
@@ -47,17 +46,17 @@
 //	@Tags		Contract
 //	@Summary	鍒犻櫎鍚堝悓
 //	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.DeleteContract true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/contract/delete/{id} [delete]
+//	@Router		/api/contract/delete [delete]
 func (s *ContractApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteContract
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := contractService.DeleteContract(id)
+	errCode := contractService.DeleteContract(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -98,7 +97,6 @@
 	ctx.Ok()
 }
 
-
 func checkContractParams(contract request.Contract) (errCode int, contractModel model.Contract) {
 	//if contract.Number == "" {
 	//	return ecode.InvalidParams, contractModel
@@ -135,14 +133,14 @@
 		return
 	}
 
-	contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.Keyword)
+	contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.SearchMap)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
 	}
 
 	ctx.OkWithDetailed(response.ContractResponse{
-		List: contracts,
+		List:  contracts,
 		Count: int(total),
 	})
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0