Merge branch 'crm/crm_14.4.1_V2' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/statistic_company_merge.go

@@ -1761,6 +1761,9 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 		companyContractIds = append(companyContractIds, item.CompanyContractId)
 	}
 
+	//合同归因标签
+	mapGetCompanyAscribeContent, mapContent := services.GetCompanyContractAscribeContentMap(companyContractIds)
+
 	//合并合同所对应的权限
 	mappermissionName, err := cygxService.GetCompanyContractPermissionNameMapById(companyContractIds)
 	if err != nil {
@@ -1770,7 +1773,13 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 	}
 	for _, v := range list {
 		v.PermissionName = mappermissionName[v.CompanyContractId]
+		if mapGetCompanyAscribeContent[v.CompanyContractId] != "" {
+			v.Content = mapContent[v.CompanyContractId]
+			v.AscribeContent = mapGetCompanyAscribeContent[v.CompanyContractId]
+			v.IsShowNoRenewedNote = true
+		}
 	}
+
 	page := paging.GetPaging(currentIndex, pageSize, dataTotal)
 	resp := response.IncrementalCompanyPercentageListResp{
 		Paging:                     page,