first

controllers/seal.go

@@ -174,12 +174,15 @@ func (c *SealCommon) CheckEdit() {
 		c.FailWithMessage("合同附件不能为空", "合同附件不能为空")
 		return
 	}
+	if req.AffiliatedCompany == "" {
+		c.FailWithMessage("归属公司不能为空", "归属公司不能为空")
+	}
 
 	//数据校验（校验是否具有审批权限）
 	sealInfo, approvalInfo, approvalRecord, err := sealService.CheckApproveAuth(sealId, c.AdminWx)
 
 	//合规修改
-	err = sealService.CheckEdit(sealInfo, approvalInfo, approvalRecord, req.FileNum, req.FileUrls, req.Use, req.SealType, req.Remark, c.AdminWx)
+	err = sealService.CheckEdit(sealInfo, approvalInfo, approvalRecord, req.FileNum, req.FileUrls, req.Use, req.SealType, req.Remark, req.AffiliatedCompany, c.AdminWx)
 	if err != nil {
 		c.FailWithMessage("修改合同失败！", "修改合同失败，Err:"+err.Error())
 		return

models/request/seal/sale.go

@@ -33,12 +33,13 @@ type EditReq struct {
 
 // 审批者编辑用印请求
 type CheckEditReq struct {
-	SealId   int      `description:"用印单id"`
-	Use      string   `description:"用印用途，枚举值：'销售合同', '渠道合同', '付款通知函', '招投标', '战略合作协议'；默认：销售合同"`
-	SealType string   `description:"加盖印章类型，枚举值：'合同章', '公章', '法人章';默认：合同章"`
-	Remark   string   `description:"备注,长度255位"`
-	FileUrls []string `description:"文件附件地址"`
-	FileNum  int      `description:"文件份数"`
+	SealId            int      `description:"用印单id"`
+	Use               string   `description:"用印用途，枚举值：'销售合同', '渠道合同', '付款通知函', '招投标', '战略合作协议'；默认：销售合同"`
+	SealType          string   `description:"加盖印章类型，枚举值：'合同章', '公章', '法人章';默认：合同章"`
+	Remark            string   `description:"备注,长度255位"`
+	FileUrls          []string `description:"文件附件地址"`
+	FileNum           int      `description:"文件份数"`
+	AffiliatedCompany string   `description:"归属公司"`
 }
 
 // InvalidReq 作废用印请求

services/seal/seal.go

@@ -198,7 +198,7 @@ func Edit(sealId, userId, contractId, fileNum int, use, companyName, userCompany
 }
 
 // CheckEdit 审批者修改用印
-func CheckEdit(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractApproval, approvalRecord *contract_approval_record.ContractApprovalRecord, fileNum int, fileUrls []string, use, sealType, remark string, opUser *custom.AdminWx) (err error) {
+func CheckEdit(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractApproval, approvalRecord *contract_approval_record.ContractApprovalRecord, fileNum int, fileUrls []string, use, sealType, remark, affiliatedCompany string, opUser *custom.AdminWx) (err error) {
 	if !strings.Contains(strings.Join(seal.EnumUse, ","), use) {
 		err = errors.New("用印用途异常")
 		return
@@ -256,6 +256,10 @@ func CheckEdit(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractAppr
 		updateContent = append(updateContent, "文件附件")
 		attachmentFlag = true
 	}
+	if sealInfo.AffiliatedCompany != affiliatedCompany {
+		updateCol = append(updateCol, "AffiliatedCompany")
+		updateContent = append(updateContent, "归属公司")
+	}
 	fmt.Println(updateCol)
 
 	if len(updateCol) <= 0 {
@@ -288,6 +292,7 @@ func CheckEdit(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractAppr
 		sealInfo.FileNum = fileNum
 		sealInfo.FileUrl = newFileUrl
 		sealInfo.ModifyTime = time.Now()
+		sealInfo.AffiliatedCompany = affiliatedCompany
 		checkEdit(sealInfo, updateCol, approvalRecord.ContractApprovalRecordId, content, opUser, attachmentFlag, fileUrls)
 
 		//重新获取最新的用印单
@@ -311,6 +316,7 @@ func CheckEdit(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractAppr
 		sealInfo.FileNum = fileNum
 		sealInfo.FileUrl = newFileUrl
 		sealInfo.ModifyTime = time.Now()
+		sealInfo.AffiliatedCompany = affiliatedCompany
 		checkEdit(sealInfo, updateCol, approvalRecord.ContractApprovalRecordId, content, opUser, attachmentFlag, fileUrls)
 
 		//审核通过