From 20ca649b9f0fa0af0361024149dee6833858c2fa Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 17:12:27 +0800
Subject: [PATCH] fix

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

diff --git a/api/v1/serviceOrder.go b/api/v1/serviceOrder.go
index 3beabbd..f76babe 100644
--- a/api/v1/serviceOrder.go
+++ b/api/v1/serviceOrder.go
@@ -6,6 +6,7 @@
 	"aps_crm/model/response"
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
+	"aps_crm/pkg/structx"
 	"aps_crm/service"
 	"github.com/gin-gonic/gin"
 	"strconv"
@@ -28,6 +29,10 @@
 	}
 
 	serviceOrder := new(model.ServiceOrder)
+	if err := structx.AssignTo(params, serviceOrder); err != nil {
+		ctx.Fail(ecode.ParamsErr)
+		return
+	}
 
 	errCode := service.NewServiceOrderService().AddServiceOrder(serviceOrder)
 	if errCode != ecode.OK {
@@ -75,7 +80,13 @@
 		return
 	}
 
-	errCode := service.NewServiceOrderService().UpdateServiceOrder(&params.ServiceOrder)
+	serviceOrder := new(model.ServiceOrder)
+	if err := structx.AssignTo(params, serviceOrder); err != nil {
+		ctx.Fail(ecode.ParamsErr)
+		return
+	}
+
+	errCode := service.NewServiceOrderService().UpdateServiceOrder(serviceOrder)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -88,22 +99,24 @@
 // @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, params.ServiceContractId, params.SalesDetailsId)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
 	}
 
 	ctx.OkWithDetailed(response.ListResponse{
-		Data: serviceOrder,
+		Data:  serviceOrder,
 		Count: total,
 	})
 }

--
Gitblit v1.8.0