From 4b63908ad085bc570623f7b0c0fd397b2ae7a80d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 07 八月 2023 15:41:32 +0800
Subject: [PATCH] 增加文件列表接口，文件上传时间，文件删除时间

---
 api/v1/client.go |   86 +++++++++++++++++++++++--------------------
 1 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/api/v1/client.go b/api/v1/client.go
index 2e3d7ee..3be607b 100644
--- a/api/v1/client.go
+++ b/api/v1/client.go
@@ -7,7 +7,6 @@
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type ClientApi struct{}
@@ -44,44 +43,22 @@
 	ctx.Ok()
 }
 
-// List
-//
-//	@Tags		Client
-//	@Summary	鑾峰彇瀹㈡埛鍒楄〃
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.ClientResponse}
-//	@Router		/api/client/list [get]
-func (cli *ClientApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-
-	errCode, clients := clientService.GetClientList()
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.ClientResponse{List: clients})
-}
-
 func checkClientParams(params request.Client) (int, *model.Client) {
 	client := new(model.Client)
-	if params.Name == "" {
-		return ecode.InvalidParams, nil
-	}
+	//if params.Name == "" {
+	//	return ecode.InvalidParams, nil
+	//}
 
 	client.Name = params.Name
 
-	if params.ClientStatusId == 0 {
-		return ecode.InvalidParams, nil
-	}
-	client.ClientStatusId = params.ClientStatusId
-
-	if params.MemberId == 0 {
-		return ecode.InvalidParams, nil
-	}
+	//if params.ClientStatusId == 0 {
+	//	return ecode.InvalidParams, nil
+	//}
+	//client.ClientStatusId = params.ClientStatusId
+	//
+	//if params.MemberId == 0 {
+	//	return ecode.InvalidParams, nil
+	//}
 	client.MemberId = params.MemberId
 
 	t, err := checkTimeFormat(params.NextVisitTime)
@@ -142,17 +119,17 @@
 //	@Tags		Client
 //	@Summary	鍒犻櫎瀹㈡埛
 //	@Produce	application/json
-//	@Param		id	path		int	true	"瀹㈡埛ID"
+//	@Param		object	body		request.DeleteClient true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/client/delete/{id} [delete]
+//	@Router		/api/client/delete [delete]
 func (cli *ClientApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteClient
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := clientService.DeleteClient(id)
+	errCode := clientService.DeleteClient(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -168,7 +145,7 @@
 //	@Produce	application/json
 //	@Param		object	body		request.UpdateClient	true	"鏌ヨ鍙傛暟"
 //	@Success	200		{object}	contextx.Response{}
-//	@Router		/api/client/update [post]
+//	@Router		/api/client/update [put]
 func (cli *ClientApi) Update(c *gin.Context) {
 	var params request.UpdateClient
 	ctx, ok := contextx.NewContext(c, &params)
@@ -188,6 +165,8 @@
 		return
 	}
 
+	client.Id = params.Id
+
 	errCode = clientService.UpdateClient(client)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -196,3 +175,30 @@
 
 	ctx.Ok()
 }
+
+// List
+//
+//	@Tags		Client
+//	@Summary	瀹㈡埛鍒楄〃
+//	@Produce	application/json
+//	@Param		object	body		request.GetClientList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.ClientResponse}
+//	@Router		/api/client/list [post]
+func (cli *ClientApi) List(c *gin.Context) {
+	var params request.GetClientList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	clients, total, errCode := clientService.GetClientList(params.Page, params.PageSize, params.Keyword)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.ClientResponse{
+		List:  clients,
+		Count: int(total),
+	})
+}

--
Gitblit v1.8.0