From 9a7e0a7da01a9f9625ceaca0c61a59c540c6438f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:32:10 +0800
Subject: [PATCH] fix

---
 api/v1/plan.go |   52 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/api/v1/plan.go b/api/v1/plan.go
index 7078033..f09f7d9 100644
--- a/api/v1/plan.go
+++ b/api/v1/plan.go
@@ -87,6 +87,8 @@
 		return
 	}
 
+	plan.Id = params.Id
+
 	errCode = planService.UpdatePlan(&plan)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -96,29 +98,6 @@
 	ctx.Ok()
 }
 
-// List
-//
-//	@Tags		Plan
-//	@Summary	鑾峰彇璁″垝鍒楄〃
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.PlanResponse}
-//	@Router		/api/plan/list [get]
-func (s *PlanApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-
-	list, errCode := planService.GetPlanList()
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.PlanResponse{
-		List: list,
-	})
-}
 
 func checkPlanParams(plan request.Plan) (errCode int, p model.Plan) {
 	//if plan.Number == "" {
@@ -153,3 +132,30 @@
 
 	return ecode.OK, p
 }
+
+// List
+//
+//	@Tags		Plan
+//	@Summary	鐢熸垚璁″垝鍒楄〃
+//	@Produce	application/json
+//	@Param		object	body		request.GetPlanList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.PlanResponse}
+//	@Router		/api/plan/list [post]
+func (con *PlanApi) List(c *gin.Context) {
+	var params request.GetPlanList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	plans, total, errCode := planService.GetPlanList(params.Page, params.PageSize, params.Keyword)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.PlanResponse{
+		List: plans,
+		Count: int(total),
+	})
+}
\ No newline at end of file

--
Gitblit v1.8.0