Merge branch 'crm1.0' into debug

controllers/seal.go

@@ -42,7 +42,7 @@ func (this *SealCommon) Add() {
 		this.FailWithMessage("缺少参数", err.Error())
 		return
 	}
-	sealInfo, err := sealService.AddSeal(this.AdminWx.AdminId, req.ContractId, this.AdminWx.RealName, req.Use, req.UseCompanyName, req.CompanyName, req.CreditCode, req.ServiceType, req.SealType, req.Remark, req.FileUrl)
+	sealInfo, err := sealService.AddSeal(this.AdminWx.AdminId, req.ContractId, req.FileNum, this.AdminWx.RealName, req.Use, req.UseCompanyName, req.CompanyName, req.CreditCode, req.ServiceType, req.SealType, req.Remark, req.FileUrl)
 	if err != nil {
 		this.FailWithMessage("用印添加失败", err.Error())
 		return
@@ -87,7 +87,7 @@ func (this *SealCommon) Edit() {
 		this.FailWithMessage("合同编号必传！", "合同编号必传！")
 		return
 	}
-	sealInfo, err := sealService.Edit(req.SealId, this.AdminWx.AdminId, req.ContractId, req.Use, req.CompanyName, req.UseCompanyName, req.CreditCode, req.ServiceType, req.SealType, req.Remark, req.FileUrl)
+	sealInfo, err := sealService.Edit(req.SealId, this.AdminWx.AdminId, req.ContractId, req.FileNum, req.Use, req.CompanyName, req.UseCompanyName, req.CreditCode, req.ServiceType, req.SealType, req.Remark, req.FileUrl)
 	if err != nil {
 		this.FailWithMessage("修改合同失败！", "修改合同失败，Err:"+err.Error())
 		return

models/request/seal/sale.go

@@ -11,6 +11,7 @@ type AddReq struct {
 	SealType       string `description:"加盖印章类型，枚举值：'合同章', '公章', '法人章';默认：合同章"`
 	Remark         string `description:"备注,长度255位"`
 	FileUrl        string `description:"文件附件地址"`
+	FileNum        int    `description:"文件份数"`
 }
 
 //编辑用印请求
@@ -25,4 +26,5 @@ type EditReq struct {
 	SealType       string `description:"加盖印章类型，枚举值：'合同章', '公章', '法人章';默认：合同章"`
 	Remark         string `description:"备注,长度255位"`
 	FileUrl        string `description:"文件附件地址"`
+	FileNum        int    `description:"文件份数"`
 }

models/tables/seal/seal.go

@@ -23,6 +23,7 @@ type Seal struct {
 	Remark         string    `description:"补充内容,长度255位"`
 	ApprovalRemark string    `description:"审核备注"`
 	FileUrl        string    `description:"文件附件地址"`
+	FileNum        int       `description:"文件附件份数"`
 	ContractId     int       `description:"系统合同id"`
 	IsDelete       int       `description:"是否已经删除，0：未删除，1：已删除",json:"-"`
 	ModifyTime     time.Time `description:"最近一次修改时间"`

services/seal/seal.go

@@ -10,7 +10,7 @@ import (
 )
 
 //添加用印
-func AddSeal(userId, contractId int, userName, use, useCompanyName, companyName, creditCode, serviceType, sealType, remark, fileUrl string) (sealInfo *seal.Seal, err error) {
+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{"新增业务", "续约业务", "补充协议"}
 	sealTypeList := []string{"合同章", "公章", "法人章"}
@@ -44,6 +44,7 @@ func AddSeal(userId, contractId int, userName, use, useCompanyName, companyName,
 		Status:         "待提交",
 		Remark:         remark,
 		FileUrl:        fileUrl,
+		FileNum:        fileNum,
 		ContractId:     contractId,
 		ModifyTime:     time.Now(),
 		CreateTime:     time.Now(),
@@ -53,7 +54,7 @@ func AddSeal(userId, contractId int, userName, use, useCompanyName, companyName,
 }
 
 //修改用印
-func Edit(sealId, userId, contractId int, use, companyName, userCompanyName, creditCode, serviceType, sealType, remark, fileUrl string) (sealInfo *seal.Seal, err error) {
+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{"新增业务", "续约业务", "补充协议"}
 	sealTypeList := []string{"合同章", "公章", "法人章"}
@@ -96,6 +97,7 @@ func Edit(sealId, userId, contractId int, use, companyName, userCompanyName, cre
 	sealInfo.SealType = sealType
 	sealInfo.Remark = remark
 	sealInfo.FileUrl = fileUrl
+	sealInfo.FileNum = fileNum
 	sealInfo.ContractId = contractId
 	sealInfo.ModifyTime = time.Now()
 	sealInfo.Status = "待提交" //用印状态