Merge branch 'test'

@@ -55,6 +55,8 @@ type ContractParticipant struct {
 	SensitiveFlag bool `json:"sensitiveFlag"`
 	SensitiveFlag bool `json:"sensitiveFlag"`
 	// 共创合约编号
 	// 共创合约编号
 	primaryKey string `json:"key"`
 	primaryKey string `json:"key"`
+	// 支付凭证去重
+	duplicatePaymentDocuments map[string]struct{}
 }
 }
 
 
 func (u *User) SimpleCopy() map[string]interface{} {
 func (u *User) SimpleCopy() map[string]interface{} {
@@ -78,16 +80,25 @@ func (ut *Salesman) ToUser() *User {
 
 
 func NewContractParticipant(u *User, primaryKey string, attachments []*Attachment) *ContractParticipant {
 func NewContractParticipant(u *User, primaryKey string, attachments []*Attachment) *ContractParticipant {
 	p := &ContractParticipant{
 	p := &ContractParticipant{
-		User:             u,
-		Participant:      u.SimpleCopy(),
-		primaryKey:       primaryKey,
-		PaymentDocuments: make([]*Attachment, 0),
+		User:                      u,
+		Participant:               u.SimpleCopy(),
+		primaryKey:                primaryKey,
+		PaymentDocuments:          make([]*Attachment, 0),
+		duplicatePaymentDocuments: make(map[string]struct{}),
 	}
 	}
 	if len(attachments) > 0 {
 	if len(attachments) > 0 {
 		p.ContractContent = attachments[0].Name
 		p.ContractContent = attachments[0].Name
 	}
 	}
 	return p
 	return p
 }
 }
+func (cp *ContractParticipant) AppendAttachments(attachments []*Attachment) {
+	for i := range attachments {
+		if _, ok := cp.duplicatePaymentDocuments[attachments[i].Url]; !ok {
+			cp.duplicatePaymentDocuments[attachments[i].Url] = struct{}{}
+			cp.PaymentDocuments = append(cp.PaymentDocuments, attachments[i])
+		}
+	}
+}
 
 
 func (cp *ContractParticipant) Complete(userBaseId int64, sensitive bool) *ContractParticipant {
 func (cp *ContractParticipant) Complete(userBaseId int64, sensitive bool) *ContractParticipant {
 	cp.SensitiveFlag = false
 	cp.SensitiveFlag = false

@@ -320,7 +320,7 @@ func (ptr *CooperationStatisticsService) PersonCooperationProjectSharedInfo(quer
 					if len(v.PaymentDocument) == 0 && len(mapCreditAccount[key].PaymentDocumentAttachments) > 0 {
 					if len(v.PaymentDocument) == 0 && len(mapCreditAccount[key].PaymentDocumentAttachments) > 0 {
 						v.PaymentDocument = "查看"
 						v.PaymentDocument = "查看"
 					}
 					}
-					v.PaymentDocuments = append(v.PaymentDocuments, creditAccounts[i].PaymentDocumentAttachments...)
+					v.AppendAttachments(creditAccounts[i].PaymentDocumentAttachments)
 				}
 				}
 			}
 			}
 		}
 		}

@@ -885,6 +885,7 @@ func (repository *CooperationContractRepository) UpdateOne(cooperationContract *
 		CreatedAt:                          cooperationContract.CreatedAt,
 		CreatedAt:                          cooperationContract.CreatedAt,
 		DeletedAt:                          cooperationContract.DeletedAt,
 		DeletedAt:                          cooperationContract.DeletedAt,
 		UpdatedAt:                          time.Now(),
 		UpdatedAt:                          time.Now(),
+		CooperationProjectId:               cooperationContract.CooperationProjectId,
 	}
 	}
 	if _, err := tx.Model(cooperationContractModel).WherePK().Update(); err != nil {
 	if _, err := tx.Model(cooperationContractModel).WherePK().Update(); err != nil {
 		return nil, err
 		return nil, err
@@ -915,6 +916,7 @@ func (repository *CooperationContractRepository) UpdateMany(cooperationContracts
 			CreatedAt:                          cooperationContract.CreatedAt,
 			CreatedAt:                          cooperationContract.CreatedAt,
 			DeletedAt:                          cooperationContract.DeletedAt,
 			DeletedAt:                          cooperationContract.DeletedAt,
 			UpdatedAt:                          time.Now(),
 			UpdatedAt:                          time.Now(),
+			CooperationProjectId:               cooperationContract.CooperationProjectId,
 		})
 		})
 	}
 	}
 	if _, err := tx.Model(&cooperationContractModels).WherePK().Update(); err != nil {
 	if _, err := tx.Model(&cooperationContractModels).WherePK().Update(); err != nil {