From 2b3a8140d6ca91cfb9f5aefcb6db067a8284215c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 13 十月 2023 18:00:54 +0800
Subject: [PATCH] fix
---
api/v1/contract.go | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/api/v1/contract.go b/api/v1/contract.go
index ff42186..f1702f7 100644
--- a/api/v1/contract.go
+++ b/api/v1/contract.go
@@ -1,11 +1,13 @@
package v1
import (
+ "aps_crm/constvar"
"aps_crm/model"
"aps_crm/model/request"
"aps_crm/model/response"
"aps_crm/pkg/contextx"
"aps_crm/pkg/ecode"
+ "aps_crm/utils"
"github.com/gin-gonic/gin"
)
@@ -36,6 +38,14 @@
if errCode != ecode.OK {
ctx.Fail(errCode)
return
+ }
+
+ if params.CodeRule.Method == 1 {
+ autoCode := model.GetAutoCode(contract.Id, ¶ms.CodeRule)
+ m := map[string]interface{}{
+ "number": autoCode,
+ }
+ _ = model.NewContractSearch().SetId(contract.Id).UpdateByMap(m)
}
ctx.Ok()
@@ -107,12 +117,14 @@
//}
contractModel = model.Contract{
- ClientId: contract.ClientId,
- MemberId: contract.MemberId,
- Number: contract.Number,
- QuotationId: contract.QuotationId,
- StatusId: contract.StatusId,
- File: contract.File,
+ ClientId: contract.ClientId,
+ MemberId: contract.MemberId,
+ Number: contract.Number,
+ QuotationId: contract.QuotationId,
+ StatusId: contract.StatusId,
+ File: contract.File,
+ CodeStandID: contract.CodeStandID,
+ ContractName: contract.ContractName,
}
return ecode.OK, contractModel
@@ -133,6 +145,14 @@
return
}
+ userInfo := utils.GetUserInfo(c)
+ if userInfo.UserType == constvar.UserTypeSub {
+ if params.SearchMap == nil {
+ params.SearchMap = make(map[string]interface{}, 0)
+ }
+ params.SearchMap["member_id"] = userInfo.CrmUserId
+ }
+
contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.SearchMap)
if errCode != ecode.OK {
ctx.Fail(errCode)
--
Gitblit v1.8.0