Merge branch 'crm/crm_16.7' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/statistic/rai_data_summary.go

@@ -648,7 +648,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 				}
 			}
 
-			if len(sellerDevelop) > 0 {
+			if len(sellerDevelop) > 0 && adminId == "" {
 				sellerItem := new(statistic_report.RaiDataSummaryDetail)
 				sellerItem.SellerId = strings.Join(sellerIds, ",")
 				sellerItem.SellerName = "开拓组合计"
@@ -764,7 +764,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 					item.DataList = append(item.DataList, sellerItem)
 				}
 			}
-			if len(sellerService) > 0 {
+			if len(sellerService) > 0 && serviceAdminId == "" {
 				sellerItem := new(statistic_report.RaiDataSummaryDetail)
 				sellerItem.IsServerSeller = true
 				sellerItem.SellerId = strings.Join(sellerServiceIds, ",")
@@ -1012,7 +1012,11 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 				item := new(statistic_report.RaiDataSummaryDetailResp)
 				item.CompanyId = v.CompanyId
 				item.CompanyName = v.CompanyName
-				item.SellerName = v.SellerNameInit
+				if isServerSeller {
+					item.SellerName = v.ShareSeller
+				} else {
+					item.SellerName = v.SellerNameInit
+				}
 				item.StartDate = v.StartDate
 				item.EndDate = v.EndDate
 				item.Money = v.Money
@@ -1074,7 +1078,11 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 				item := new(statistic_report.RaiDataSummaryDetailResp)
 				item.CompanyId = v.CompanyId
 				item.CompanyName = v.CompanyName
-				item.SellerName = v.SellerNameLast
+				if isServerSeller {
+					item.SellerName = v.ShareSellerLast
+				} else {
+					item.SellerName = v.SellerNameLast
+				}
 				item.StartDate = v.StartDate
 				item.EndDate = v.EndDate
 				item.Money = v.Money
@@ -1131,7 +1139,11 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 				item := new(statistic_report.RaiDataSummaryDetailResp)
 				item.CompanyId = v.CompanyId
 				item.CompanyName = v.CompanyName
-				item.SellerName = v.SellerNameLast
+				if isServerSeller {
+					item.SellerName = v.ShareSellerLast
+				} else {
+					item.SellerName = v.SellerNameLast
+				}
 				item.StartDate = v.StartDate
 				item.EndDate = v.EndDate
 				item.Money = v.Money
@@ -1150,9 +1162,13 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		var conditionEnd string
 		var parsEnd []interface{}
 		if sellerId != "" {
-			condition += ` AND a.seller_id_last IN (` + sellerId + `) `
-
-			conditionEnd += ` AND a.seller_id_last  IN (` + sellerId + `) `
+			if isServerSeller {
+				condition += ` AND a.share_seller_id_last IN (` + sellerId + `) `
+				conditionEnd += ` AND a.share_seller_id_last  IN (` + sellerId + `) `
+			} else {
+				condition += ` AND a.seller_id_last IN (` + sellerId + `) `
+				conditionEnd += ` AND a.seller_id_last  IN (` + sellerId + `) `
+			}
 		}
 
 		condition += ` AND  a.status = 1  AND a.inherit_end_date >= ?  AND a.inherit_end_date <= ?  AND  inherit_company_contract_id > 0    AND a.rai_contract_type = '续约合同' AND a.company_contract_id NOT  IN (` + utils.GetOrmInReplace(lenArrCompany) + `)  `