From 724674c54da32406a16264850c3719b2553aada6 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 10 八月 2023 19:35:36 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 api/v1/serviceOrder.go |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/api/v1/serviceOrder.go b/api/v1/serviceOrder.go
index 426dcef..1eec84f 100644
--- a/api/v1/serviceOrder.go
+++ b/api/v1/serviceOrder.go
@@ -99,15 +99,17 @@
 // @Tags		鏈嶅姟鍗曠鐞�
 // @Summary	鑾峰彇鏈嶅姟鍗曞垪琛�
 // @Produce	application/json
+// @Param		object	body		request.GetServiceOrderList	true	"鍙傛暟"
 // @Success	200	{object}	response.ListResponse{data=[]model.ServiceOrder}
-// @Router		/api/serviceOrder/list [get]
+// @Router		/api/serviceOrder/list [post]
 func (s *ServiceOrderApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.GetServiceOrderList
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList()
+	serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return

--
Gitblit v1.8.0