Merge branch 'crm1.0' into debug

controllers/seal_approval.go

@@ -22,7 +22,7 @@ type SealApprovalCommon struct {
 // @Title 审批单列表
 // @Description 审批单列表接口
 // @Param   Use   query   string  false       "用途，枚举值：销售合同, 渠道合同, 付款通知函, 招投标, 战略合作协议"
-// @Param   ServiceType   query   string  false       "业务类型，枚举值：新增业务, 续约业务, 补充协议"
+// @Param   ServiceType   query   string  false       "业务类型，枚举值："新签合同, 续约合同, 补充协议"
 // @Param   SealType   query   string  false       "公章类型，枚举值：合同章, 公章, 法人章"
 // @Param   Status   query   string  false       "合同状态，枚举值：'待审批','已审批','已驳回','已撤回'"
 // @Param   UserId   query   string  false       "选择的申请人id"

models/request/seal/sale.go

@@ -7,7 +7,7 @@ type AddReq struct {
 	CompanyName    string `description:"客户名称，甲方名称,长度32位"`
 	UseCompanyName string `description:"实际适用方客户名称，长度32位"`
 	CreditCode     string `description:"社会统一信用代码,长度64位"`
-	ServiceType    string `description:"业务类型，枚举值：'新增业务', '续约业务', '补充协议'；默认：新增业务"`
+	ServiceType    string `description:"业务类型，枚举值：'新签合同','续约合同','补充协议'；默认：新签合同"`
 	SealType       string `description:"加盖印章类型，枚举值：'合同章', '公章', '法人章';默认：合同章"`
 	Remark         string `description:"备注,长度255位"`
 	FileUrl        string `description:"文件附件地址"`
@@ -22,7 +22,7 @@ type EditReq struct {
 	CompanyName    string `description:"客户名称，甲方名称,长度32位"`
 	UseCompanyName string `description:"实际适用方客户名称，长度32位"`
 	CreditCode     string `description:"社会统一信用代码,长度64位"`
-	ServiceType    string `description:"业务类型，枚举值：'新增业务', '续约业务', '补充协议'；默认：新增业务"`
+	ServiceType    string `description:"业务类型，枚举值：'新签合同','续约合同','补充协议'；默认：新签合同"`
 	SealType       string `description:"加盖印章类型，枚举值：'合同章', '公章', '法人章';默认：合同章"`
 	Remark         string `description:"备注,长度255位"`
 	FileUrl        string `description:"文件附件地址"`

models/tables/seal/seal.go

@@ -17,7 +17,7 @@ type Seal struct {
 	CompanyName    string    `description:"客户名称，甲方名称,长度32位"`
 	UseCompanyName string    `description:"实际使用方客户名称，长度32位"`
 	CreditCode     string    `description:"社会统一信用代码,长度64位"`
-	ServiceType    string    `description:"业务类型，枚举值：'新增业务', '续约业务', '补充协议'；默认：新增业务"`
+	ServiceType    string    `description:"业务类型，枚举值：'新签合同','续约合同','补充协议'；默认：新签合同"`
 	SealType       string    `description:"加盖印章类型，枚举值：'合同章', '公章', '法人章';默认：合同章"`
 	Status         string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废'"`
 	Remark         string    `description:"补充内容,长度255位"`

services/seal/seal.go

@@ -18,7 +18,7 @@ import (
 //添加用印
 func AddSeal(userId, contractId, fileNum int, userName, use, useCompanyName, companyName, creditCode, serviceType, sealType, remark, fileUrl string) (sealInfo *seal.Seal, err error) {
 	useList := []string{"销售合同", "渠道合同", "付款通知函", "招投标", "战略合作协议"}
-	serviceTypeList := []string{"新增业务", "续约业务", "补充协议"}
+	serviceTypeList := []string{"新签合同", "续约合同", "补充协议"}
 	sealTypeList := []string{"合同章", "公章", "法人章"}
 	if !strings.Contains(strings.Join(useList, ","), use) {
 		err = errors.New("用印用途异常")
@@ -62,7 +62,7 @@ func AddSeal(userId, contractId, fileNum int, userName, use, useCompanyName, com
 //修改用印
 func Edit(sealId, userId, contractId, fileNum int, use, companyName, userCompanyName, creditCode, serviceType, sealType, remark, fileUrl string) (sealInfo *seal.Seal, err error) {
 	useList := []string{"销售合同", "渠道合同", "付款通知函", "招投标", "战略合作协议"}
-	serviceTypeList := []string{"新增业务", "续约业务", "补充协议"}
+	serviceTypeList := []string{"新签合同", "续约合同", "补充协议"}
 	sealTypeList := []string{"合同章", "公章", "法人章"}
 	if !strings.Contains(strings.Join(useList, ","), use) {
 		err = errors.New("用印用途异常")