...
|
...
|
@@ -271,15 +271,6 @@ func (ptr *CooperationStatisticsService) PersonCooperationProjectSharedInfo(quer |
|
|
key := keyfun(u.CooperationContractNumber, u.Undertaker.UserBaseId)
|
|
|
userSorted = append(userSorted, key)
|
|
|
mapUser[keyfun(u.CooperationContractNumber, u.Undertaker.UserBaseId)] = domain.NewContractParticipant(u.Undertaker.ToUser(), key, u.Undertaker.ContractAttachment)
|
|
|
//if u.Undertaker.Referrer != nil {
|
|
|
// key = keyfun(u.CooperationContractNumber, u.Undertaker.Referrer.UserBaseId)
|
|
|
// userSorted = append(userSorted, key)
|
|
|
// mapUser[keyfun(u.CooperationContractNumber, u.Undertaker.Referrer.UserBaseId)] = domain.NewContractParticipant(u.Undertaker.Referrer.ToUser(), key, u.Undertaker.ContractAttachment)
|
|
|
//}
|
|
|
//if u.Undertaker.Salesman != nil {
|
|
|
// userSorted = append(userSorted, keyfun(u.CooperationContractNumber, u.Undertaker.Salesman.UserBaseId))
|
|
|
// mapUser[keyfun(u.CooperationContractNumber, u.Undertaker.Salesman.UserBaseId)] = domain.NewContractParticipant(u.Undertaker.Salesman.ToUser(), key, u.Undertaker.ContractAttachment)
|
|
|
//}
|
|
|
}
|
|
|
|
|
|
// 2.合约的订单金额
|
...
|
...
|
@@ -325,10 +316,11 @@ func (ptr *CooperationStatisticsService) PersonCooperationProjectSharedInfo(quer |
|
|
detail := creditAccounts[i].AccountDetail[j]
|
|
|
key := keyfun(detail.CooperationContractNumber, creditAccounts[i].Participator.UserBaseId)
|
|
|
mapCreditAccount[key] = creditAccounts[i]
|
|
|
if v, ok := mapUser[key]; ok && len(v.PaymentDocument) == 0 {
|
|
|
if len(mapCreditAccount[key].PaymentDocumentAttachments) > 0 {
|
|
|
if v, ok := mapUser[key]; ok {
|
|
|
if len(v.PaymentDocument) == 0 && len(mapCreditAccount[key].PaymentDocumentAttachments) > 0 {
|
|
|
v.PaymentDocument = "查看"
|
|
|
}
|
|
|
v.PaymentDocuments = append(v.PaymentDocuments, creditAccounts[i].PaymentDocumentAttachments...)
|
|
|
}
|
|
|
}
|
|
|
}
|
...
|
...
|
|