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

---
 api/v1/serviceFollowup.go |   88 +++++++++++++++++++++++---------------------
 1 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/api/v1/serviceFollowup.go b/api/v1/serviceFollowup.go
index c1a50fe..3c2dda4 100644
--- a/api/v1/serviceFollowup.go
+++ b/api/v1/serviceFollowup.go
@@ -7,7 +7,6 @@
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
 	"github.com/gin-gonic/gin"
-	"strconv"
 )
 
 type ServiceFollowupApi struct{}
@@ -47,17 +46,17 @@
 //	@Tags		ServiceFollowup
 //	@Summary	鍒犻櫎鏈嶅姟璺熻繘
 //	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.DeleteServiceFollowup true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/serviceFollowup/delete/{id} [delete]
+//	@Router		/api/serviceFollowup/delete [delete]
 func (s *ServiceFollowupApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteServiceFollowup
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := serviceFollowupService.DeleteServiceFollowup(id)
+	errCode := serviceFollowupService.DeleteServiceFollowup(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -87,6 +86,8 @@
 		return
 	}
 
+	serviceFollowup.Id = params.Id
+
 	errCode = serviceFollowupService.UpdateServiceFollowup(&serviceFollowup)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -96,55 +97,58 @@
 	ctx.Ok()
 }
 
+// checkServiceFollowupParams
+func checkServiceFollowupParams(serviceFollowup request.ServiceFollowup) (errCode int, serviceFollowupModel model.ServiceFollowup) {
+	//if serviceFollowup.Number == "" {
+	//	return ecode.InvalidParams, serviceFollowupModel
+	//}
+	//
+	//if serviceFollowup.MemberId == 0 {
+	//	return ecode.InvalidParams, serviceFollowupModel
+	//}
+
+	serviceFollowupModel = model.ServiceFollowup{
+		ClientId:       serviceFollowup.ClientId,
+		Number:         serviceFollowup.Number,
+		ContactId:      serviceFollowup.ContactId,
+		ServiceOrderId: serviceFollowup.ServiceOrderId,
+		MemberId:       serviceFollowup.MemberId,
+		PlanId:         serviceFollowup.PlanId,
+		SatisfactionId: serviceFollowup.Satisfaction,
+		TimelyRateId:   serviceFollowup.TimelyRate,
+		SolveRateId:    serviceFollowup.SolveRate,
+		IsVisitId:      serviceFollowup.IsVisit,
+		OldMemberId:    serviceFollowup.OldMemberId,
+		Remark:         serviceFollowup.Remark,
+		File:           serviceFollowup.File,
+	}
+
+	return ecode.OK, serviceFollowupModel
+}
+
 // List
 //
 //	@Tags		ServiceFollowup
-//	@Summary	鏈嶅姟璺熻繘鍒楄〃
+//	@Summary	鍥炶鍗曠鐞嗗垪琛�
 //	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.ServiceFollowupResponse}
-//	@Router		/api/serviceFollowup/list [get]
-func (s *ServiceFollowupApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+//	@Param		object	body		request.GetServiceFollowupList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.ServiceFollowupResponse}
+//	@Router		/api/serviceFollowup/list [post]
+func (con *ServiceFollowupApi) List(c *gin.Context) {
+	var params request.GetServiceFollowupList
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	list, errCode := serviceFollowupService.GetServiceFollowupList()
+	serviceFollowups, total, errCode := serviceFollowupService.GetServiceFollowupList(params.Page, params.PageSize, params.KeywordType, params.Keyword, params.ServiceOrderId)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
 	}
 
 	ctx.OkWithDetailed(response.ServiceFollowupResponse{
-		List: list,
+		List:  serviceFollowups,
+		Count: int(total),
 	})
-}
-
-// checkServiceFollowupParams
-func checkServiceFollowupParams(serviceFollowup request.ServiceFollowup) (errCode int, serviceFollowupModel model.ServiceFollowup) {
-	if serviceFollowup.Number == "" {
-		return ecode.InvalidParams, serviceFollowupModel
-	}
-
-	if serviceFollowup.MemberId == 0 {
-		return ecode.InvalidParams, serviceFollowupModel
-	}
-
-	serviceFollowupModel = model.ServiceFollowup{
-		ClientId:     serviceFollowup.ClientId,
-		Number:       serviceFollowup.Number,
-		ContactId:    serviceFollowup.ContactId,
-		ServiceId:    serviceFollowup.ServiceId,
-		MemberId:     serviceFollowup.MemberId,
-		PlanId:       serviceFollowup.PlanId,
-		Satisfaction: serviceFollowup.Satisfaction,
-		TimelyRate:   serviceFollowup.TimelyRate,
-		SolveRate:    serviceFollowup.SolveRate,
-		IsVisit:      serviceFollowup.IsVisit,
-		OldMemberId:  serviceFollowup.OldMemberId,
-		Remark:       serviceFollowup.Remark,
-		File:         serviceFollowup.File,
-	}
-
-	return ecode.OK, serviceFollowupModel
 }

--
Gitblit v1.8.0