From f264456b1e4fd284f53ecc4c70a3b951578bfd2d Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 api/v1/serviceContractStatus.go |   79 +++++++++++++++++++--------------------
 1 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/api/v1/serviceContractStatus.go b/api/v1/serviceContractStatus.go
index ffbf8bd..c3786b7 100644
--- a/api/v1/serviceContractStatus.go
+++ b/api/v1/serviceContractStatus.go
@@ -1,12 +1,11 @@
-
 package v1
 
 import (
-	"aps_crm/model"
 	"aps_crm/model/request"
 	"aps_crm/model/response"
 	"aps_crm/pkg/contextx"
 	"aps_crm/pkg/ecode"
+	"aps_crm/service"
 	"github.com/gin-gonic/gin"
 	"strconv"
 )
@@ -14,13 +13,12 @@
 type ServiceContractStatusApi struct{}
 
 // Add
-//
-//	@Tags		ServiceContractStatus
-//	@Summary	娣诲姞鏈嶅姟鍚堝悓鐘舵��
-//	@Produce	application/json
-//	@Param		object	body		request.AddServiceContractStatus	true	"鏌ヨ鍙傛暟"
-//	@Success	200		{object}	contextx.Response{}
-//	@Router		/api/serviceContractStatus/add [post]
+// @Tags    鍚堝悓鐘舵��
+// @Summary	娣诲姞鍚堝悓鐘舵��
+// @Produce	application/json
+// @Param		object	body		request.AddServiceContractStatus	true	"鏌ヨ鍙傛暟"
+// @Success	200		{object}	contextx.Response{}
+// @Router		/api/serviceContractStatus/add [post]
 func (s *ServiceContractStatusApi) Add(c *gin.Context) {
 	var params request.AddServiceContractStatus
 	ctx, ok := contextx.NewContext(c, &params)
@@ -28,10 +26,7 @@
 		return
 	}
 
-	serviceContractStatus := new(model.ServiceContractStatus)
-	serviceContractStatus.Name = params.Name
-
-	errCode := serviceContractStatusService.AddServiceContractStatus(serviceContractStatus)
+	errCode := service.NewServiceContractStatusService().AddServiceContractStatus(&params.ServiceContractStatus)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -41,13 +36,12 @@
 }
 
 // Delete
-//
-//	@Tags		ServiceContractStatus
-//	@Summary	鍒犻櫎鏈嶅姟鍚堝悓鐘舵��
-//	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
-//	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/serviceContractStatus/delete/{id} [delete]
+// @Tags		鍚堝悓鐘舵��
+// @Summary	鍒犻櫎鍚堝悓鐘舵��
+// @Produce	application/json
+// @Param		id	path		int	true	"鏌ヨ鍙傛暟"
+// @Success	200	{object}	contextx.Response{}
+// @Router		/api/serviceContractStatus/delete/{id} [delete]
 func (s *ServiceContractStatusApi) Delete(c *gin.Context) {
 	ctx, ok := contextx.NewContext(c, nil)
 	if !ok {
@@ -55,7 +49,7 @@
 	}
 
 	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := serviceContractStatusService.DeleteServiceContractStatus(id)
+	errCode := service.NewServiceContractStatusService().DeleteServiceContractStatus(id)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -65,21 +59,24 @@
 }
 
 // Update
-//
-//	@Tags		ServiceContractStatus
-//	@Summary	鏇存柊鏈嶅姟鍚堝悓鐘舵��
-//	@Produce	application/json
-//	@Param		object	body		request.UpdateServiceContractStatuss	true	"鏌ヨ鍙傛暟"
-//	@Success	200		{object}	contextx.Response{}
-//	@Router		/api/serviceContractStatus/update [put]
+// @Tags		鍚堝悓鐘舵��
+// @Summary	鏇存柊鍚堝悓鐘舵��
+// @Produce	application/json
+// @Param		object	body		request.UpdateServiceContractStatus	true	"鏌ヨ鍙傛暟"
+// @Success	200		{object}	contextx.Response{}
+// @Router		/api/serviceContractStatus/update [put]
 func (s *ServiceContractStatusApi) Update(c *gin.Context) {
-	var params request.UpdateServiceContractStatuss
+	var params request.UpdateServiceContractStatus
 	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
+    if params.Id == 0 {
+        ctx.Fail(ecode.ParamsErr)
+    }
+    params.ServiceContractStatus.Id = params.Id
 
-	errCode := serviceContractStatusService.UpdateServiceContractStatus(params.ServiceContractStatuss)
+	errCode := service.NewServiceContractStatusService().UpdateServiceContractStatus(&params.ServiceContractStatus)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -89,25 +86,27 @@
 }
 
 // List
-//
-//	@Tags		ServiceContractStatus
-//	@Summary	鑾峰彇鏈嶅姟鍚堝悓鐘舵�佸垪琛�
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.ServiceContractStatusResponse}
-//	@Router		/api/serviceContractStatus/list [get]
+// @Tags		鍚堝悓鐘舵��
+// @Summary	鑾峰彇鍚堝悓鐘舵�佸垪琛�
+// @Produce	application/json
+// @Param		object	query		request.GetServiceContractStatusList	true	"鍙傛暟"
+// @Success	200	{object}	response.ListResponse{data=[]model.ServiceContractStatus}
+// @Router		/api/serviceContractStatus/list [get]
 func (s *ServiceContractStatusApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.GetServiceContractStatusList
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	serviceContractStatuss, errCode := serviceContractStatusService.GetServiceContractStatusList()
+	serviceContractStatus, total, errCode := service.NewServiceContractStatusService().GetServiceContractStatusList()
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
 	}
 
-	ctx.OkWithDetailed(response.ServiceContractStatusResponse{
-		List: serviceContractStatuss,
+	ctx.OkWithDetailed(response.ListResponse{
+		Data: serviceContractStatus,
+		Count: total,
 	})
 }

--
Gitblit v1.8.0