From d4bf53dd19a45ef09a367babcf7a2ac04ae1d08f Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期二, 17 十月 2023 14:31:31 +0800 Subject: [PATCH] bug修改 --- api/v1/serviceOrder.go | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/api/v1/serviceOrder.go b/api/v1/serviceOrder.go index 6675774..faef2d6 100644 --- a/api/v1/serviceOrder.go +++ b/api/v1/serviceOrder.go @@ -1,6 +1,7 @@ package v1 import ( + "aps_crm/constvar" "aps_crm/model" "aps_crm/model/request" "aps_crm/model/response" @@ -8,6 +9,7 @@ "aps_crm/pkg/ecode" "aps_crm/pkg/structx" "aps_crm/service" + "aps_crm/utils" "github.com/gin-gonic/gin" "strconv" ) @@ -28,6 +30,12 @@ return } + if params.ServiceManId == 0 { + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + params.ServiceManId = userInfo.CrmUserId + } + } serviceOrder := new(model.ServiceOrder) if err := structx.AssignTo(params, serviceOrder); err != nil { ctx.Fail(ecode.ParamsErr) @@ -38,6 +46,13 @@ if errCode != ecode.OK { ctx.Fail(errCode) return + } + if params.CodeRule.Method == 1 { + autoCode := model.GetAutoCode(serviceOrder.Id, ¶ms.CodeRule) + m := map[string]interface{}{ + "service_number": autoCode, + } + _ = model.NewServiceOrderSearch().SetId(serviceOrder.Id).UpdateByMap(m) } ctx.Ok() @@ -67,10 +82,10 @@ } // BatchDelete -// @Tags 鏈嶅姟鍗曠鐞� -// @Summary 鎵归噺鍒犻櫎鏈嶅姟鍗� +// @Tags 鏈嶅姟鍗� +// @Summary 鎵归噺鍒犻櫎鏈嶅姟鍗� // @Produce application/json -// @Param object body request.CommonIds true "鍙傛暟" +// @Param object body request.CommonIds true "鍙傛暟" // @Success 200 {object} contextx.Response{} // @Router /api/serviceOrder/delete [delete] func (s *ServiceOrderApi) BatchDelete(c *gin.Context) { @@ -132,7 +147,13 @@ return } - serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword, params.ServiceContractId, params.SalesDetailsId) + var memberIds []int + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + memberIds = []int{userInfo.CrmUserId} + } + + serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword, params.ServiceContractId, params.SalesDetailsId, memberIds) if errCode != ecode.OK { ctx.Fail(errCode) return -- Gitblit v1.8.0