fix：用印新增签回附件功能，如果是系统合同，那么需要更新系统合同中的附件；

合同在签回附件的时候，可以同步去更新对应的用印申请里面的附件信息（用印申请得是已审批或者已签回状态）

controllers/contract.go

@@ -7,6 +7,7 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/contract"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
 	contractService "hongze/hongze_mobile_admin/services/contract"
+	"hongze/hongze_mobile_admin/services/seal"
 	"hongze/hongze_mobile_admin/utils"
 	"rdluck_tools/paging"
 	"strings"
@@ -41,6 +42,9 @@ func (c *ContractCommon) UploadCheckBackFile() {
 	}
 	err = contractService.UploadCheckBackFile(req.ContractId, req.FileUrl, c.AdminWx)
 
+	//更新用印中的签回合同
+	_, _ = seal.UploadCheckBackFile(req.ContractId, req.FileUrl, c.AdminWx)
+
 	c.OkWithMessage("上传成功")
 }
 

controllers/seal.go

@@ -5,6 +5,7 @@ import (
 	sealReq "hongze/hongze_mobile_admin/models/request/seal"
 	sealResp "hongze/hongze_mobile_admin/models/response/seal"
 	"hongze/hongze_mobile_admin/models/tables/seal"
+	contractService "hongze/hongze_mobile_admin/services/contract"
 	sealService "hongze/hongze_mobile_admin/services/seal"
 	"hongze/hongze_mobile_admin/utils"
 	"rdluck_tools/paging"
@@ -332,8 +333,16 @@ func (c *SealCommon) UploadCheckBackFile() {
 		c.FailWithMessage("请先上传附件！", "请先上传附件")
 		return
 	}
-	err = sealService.UploadCheckBackFile(req.SealId, req.FileUrl, c.AdminWx)
-
+	sealInfo, err := sealService.UploadCheckBackFile(req.SealId, req.FileUrl, c.AdminWx)
+	if err != nil {
+		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
+		return
+	}
+	//如果是系统合同，那么需要去更新系统的签回附件
+	if sealInfo.ContractId > 0 {
+		_ = contractService.UploadCheckBackFile(sealInfo.ContractId, req.FileUrl, c.AdminWx)
+	}
+	return
 	c.OkWithMessage("上传成功")
 }
 

services/contract/contract.go

@@ -14,7 +14,6 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	"hongze/hongze_mobile_admin/models/tables/contract_operation_record"
 	"hongze/hongze_mobile_admin/models/tables/contract_service_detail"
-	"hongze/hongze_mobile_admin/services/seal"
 	"hongze/hongze_mobile_admin/utils"
 	"rdluck_tools/orm"
 	"reflect"
@@ -86,33 +85,13 @@ func GetContractDetail(contractId int) (contractDetail *contract.ContractDetail,
 	return
 }
 
-// UploadCheckBackFile 上传签回合同附件
+// UploadCheckBackFile 更新上传签回合同附件
 func UploadCheckBackFile(contractId int, fileUrl string, opUser *custom.AdminWx) (err error) {
 	//获取合同信息
 	contractInfo, err := contract.GetContractById(contractId)
 	if err != nil {
 		return
 	}
-	err = uploadCheckBackFile(contractInfo, fileUrl, opUser)
-
-	//更新用印中的签回合同
-	_ = seal.UploadCheckBackFileByContract(contractId, fileUrl, opUser)
-	return
-}
-
-// UploadCheckBackFileBySeal 通过更新用印签回附件来更新合同签回合同附件
-func UploadCheckBackFileBySeal(contractId int, fileUrl string, opUser *custom.AdminWx) (err error) {
-	//获取合同信息
-	contractInfo, err := contract.GetContractById(contractId)
-	if err != nil {
-		return
-	}
-	err = uploadCheckBackFile(contractInfo, fileUrl, opUser)
-	return
-}
-
-// uploadCheckBackFile 更新上传签回合同附件
-func uploadCheckBackFile(contractInfo *contract.Contract, fileUrl string, opUser *custom.AdminWx) (err error) {
 	if err != nil {
 		return
 	}

services/seal/seal.go

@@ -277,35 +277,14 @@ func Invalid(sealId int, opUser *custom.AdminWx, isInvalidContract bool) (err er
 	return
 }
 
-// UploadCheckBackFile 上传签回用印附件
-func UploadCheckBackFile(sealId int, fileUrl string, opUser *custom.AdminWx) (err error) {
+// UploadCheckBackFile 上传签回用印附件（实际操作）
+func UploadCheckBackFile(sealId int, fileUrl string, opUser *custom.AdminWx) (sealInfo *seal.Seal, err error) {
 	//查询当前用印信息
-	sealInfo, err := seal.GetSealInfoById(sealId)
-	if err != nil {
-		return
-	}
-	err = uploadCheckBackFile(sealInfo, fileUrl, opUser)
-
-	//如果是系统合同，那么需要去更新系统的签回附件
-	if sealInfo.ContractId > 0 {
-		_ = contractService.UploadCheckBackFileBySeal(sealInfo.ContractId, fileUrl, opUser)
-	}
-	return
-}
-
-// UploadCheckBackFile 上传签回用印附件
-func UploadCheckBackFileByContract(contractId int, fileUrl string, opUser *custom.AdminWx) (err error) {
-	//查询当前用印信息
-	sealInfo, err := seal.GetSealInfoByContractId(contractId)
+	sealInfo, err = seal.GetSealInfoById(sealId)
 	if err != nil {
 		return
 	}
-	err = uploadCheckBackFile(sealInfo, fileUrl, opUser)
-	return
-}
 
-// uploadCheckBackFile 上传签回用印附件（实际操作）
-func uploadCheckBackFile(sealInfo *seal.Seal, fileUrl string, opUser *custom.AdminWx) (err error) {
 	//用印状态判断
 	if sealInfo.Status != "已审批" && sealInfo.Status != "已签回" {
 		err = errors.New("用印状态异常，不允许上传签回用印附件，当前用印状态：" + sealInfo.Status)