feat: 调整回款相关接口

models/cm_contracts_return.go

@@ -16,7 +16,6 @@ type CmContractsReturn struct {
 	CreateUser   string    `xorm:"comment('创建人') VARCHAR(32)"`
 	AccountId    int       `xorm:"not null default 0 comment('项目用户ID') INT(11)"`
 	Remarks      string    `xorm:"comment('备注') VARCHAR(512)"`
-	Annexes      int       `xorm:"default 0 comment('附件数量') TINYINT(2)"`
 	CreateTime   time.Time `xorm:"comment('创建时间') DATETIME"`
 	UpdateTime   time.Time `xorm:"not null default 'CURRENT_TIMESTAMP' comment('更新时间') TIMESTAMP"`
 }

services/contract_return_service.go

@@ -37,9 +37,11 @@ func (s *contractService) makeContractRetrunVM(data *models.CmContractsReturn) *
 	viewContractsReturn.Way = data.Way
 	viewContractsReturn.CreateUser = data.CreateUser
 	viewContractsReturn.Remarks = data.Remarks
-	viewContractsReturn.Annexes = data.Annexes
 	viewContractsReturn.CreateTime = data.CreateTime.Format(conf.SysTimeform)
 
+	counts, _ := s.annexDao.GetCount(1, data.Id)
+	viewContractsReturn.FileCounts = counts
+
 	return viewContractsReturn
 }
 

services/contract_service.go

@@ -68,6 +68,7 @@ type contractService struct {
 	contractDao       *dao.ContractDao
 	contractReturnDao *dao.ContractReturnDao
 	treeDao           *dao.TreeDao
+	annexDao          *dao.AnnexDao
 }
 
 //创建项目用户service
@@ -77,6 +78,7 @@ func NewContractService() ContractService {
 		contractDao:       dao.NewContractDao(datasource.InstanceDbMaster()),
 		contractReturnDao: dao.NewContractReturnDao(datasource.InstanceDbMaster()),
 		treeDao:           dao.NewTreeDao(datasource.InstanceDbMaster()),
+		annexDao:          dao.NewAnnexDao(datasource.InstanceDbMaster()),
 	}
 }
 

services/safe_service.go

@@ -105,8 +105,22 @@ func (s *safeService) GetDetail(id int, pid int) viewmodels.SafeDetail {
 	data.AuditName = account.Name
 	data.CreateTime = safeData.CreateTime
 	fileList, total := s.daoAnnex.GetList(3, safeData.Id, 1, conf.PageSize)
+	// 加密id
+	fileArr := make([]viewmodels.AnnexListView, 0)
+	for _, item := range fileList {
+		fileListVM := viewmodels.AnnexListView{}
+		fileId, _ := comm.AesEncrypt(item.Id, conf.SignSecret)
+		fileListVM.Id = fileId
+		uid, _ := comm.AesEncrypt(item.AccountId, conf.SignSecret)
+		fileListVM.AccountId = uid
+		fileListVM.AccountName = item.AccountName
+		fileListVM.CreateTime = item.CreateTime
+		fileListVM.FileName = item.FileName
+		fileListVM.FilePath = item.FilePath
+		fileArr = append(fileArr, fileListVM)
+	}
 	fileVM := viewmodels.FileStruct{}
-	fileVM.FileList = fileList
+	fileVM.FileList = fileArr
 	fileVM.Total = total
 	data.File = fileVM
 	auditors := s.daoSafeAudit.GetAuditors(safeData.Id, safeData.Times, account.Id)

web/viewmodels/contracts_return.go

@@ -20,8 +20,8 @@ type ContractsReturn struct {
 	CreateUser string `form:"createUser" json:"createUser" `
 	AccountId  string `form:"accountId" json:"accountId" `
 	Remarks    string `form:"remarks" json:"remarks" `
-	Annexes    int    `form:"annexes" json:"annexes" `
 	CreateTime string `form:"createTime" json:"createTime" `
+	FileCounts int64  `from:"fileCounts" json:"fileCounts"`
 
 	Page int `form:"page" json:"page" `
 }