|
...
|
...
|
@@ -262,7 +262,7 @@ func (ptr *CooperationStatisticsService) PersonCooperationProjectSharedInfo(quer |
|
|
|
|
|
|
|
// 1.项目的承接人
|
|
|
|
undertakerRepository, _ := repository.NewCooperationContractUndertakerRepository(ptr.transactionContext)
|
|
|
|
_, undertakers, err := undertakerRepository.Find(map[string]interface{}{"cooperationContractNumbers": contractNumbers, "companyId": project.Company.CompanyId, "orgId": project.Org.OrgId, "offsetLimitFlag": false})
|
|
|
|
_, undertakers, err := undertakerRepository.Find(map[string]interface{}{"cooperationContractNumbers": contractNumbers, "companyId": project.Company.CompanyId, "orgId": project.Org.OrgId, "offsetLimit": false})
|
|
|
|
userSorted := make([]string, 0)
|
|
|
|
mapUser := make(map[string]*domain.ContractParticipant)
|
|
|
|
for i := range undertakers {
|
|
...
|
...
|
@@ -311,6 +311,7 @@ func (ptr *CooperationStatisticsService) PersonCooperationProjectSharedInfo(quer |
|
|
|
creditAccountRepository, _ := repository.NewCreditAccountRepository(ptr.transactionContext)
|
|
|
|
_, creditAccounts, err := creditAccountRepository.Find(map[string]interface{}{
|
|
|
|
"creditAccountIds": creditAccountIds,
|
|
|
|
"offsetLimit": false,
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
...
|
...
|
|
