no message

controllers/statistic/rai_data_summary.go

@@ -373,11 +373,11 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		mapSignedClientMoneyServer[keyMap] += v.Money
 		mapSignedClientMoneyServer[keyMapTtoal] += v.Money
 
-		//if !mapCompanyData[keySigned] {
-		//	mapSignedClientNum[keyMap]++
-		//	mapSignedClientNum[keyMapTtoal]++
-		//	mapCompanyData[keySigned] = true
-		//}
+		if !mapCompanyData[keySigned] {
+			mapSignedClientNumServer[keyMap]++
+			mapSignedClientNumServer[keyMapTtoal]++
+			mapCompanyData[keySigned] = true
+		}
 	}
 
 	//确认不续约、到期合同部分的数据
@@ -1291,7 +1291,12 @@ 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.ShareSellerLast
+				} else {
+					item.SellerName = v.SellerNameLast
+				}
+
 				item.StartDate = v.StartDate
 				item.EndDate = v.EndDate
 				item.Money = v.Money
@@ -1313,9 +1318,14 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		var conditionEnd string
 		var parsEnd []interface{}
 		if sellerId != "" {
-			condition += ` 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 + `) `
+			}
 
-			conditionEnd += ` AND a.seller_id_last  IN (` + sellerId + `) `
 		}
 
 		condition += ` AND  a.product_id = 2  AND  a.status = 1  AND  a.end_date >= ?  AND  a.end_date <= ? AND a.end_date <= ?  `
@@ -1389,9 +1399,13 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		var conditionInherit string
 		var parsInherit []interface{}
 		if sellerId != "" {
-			condition += ` AND a.seller_id_last IN (` + sellerId + `) `
-
-			conditionInherit += ` AND a.seller_id_last  IN (` + sellerId + `) `
+			if isServerSeller {
+				condition += ` AND a.share_seller_id_last  IN (` + sellerId + `) `
+				conditionInherit += ` AND a.share_seller_id_last  IN (` + sellerId + `) `
+			} else {
+				condition += ` AND a.seller_id_last IN (` + sellerId + `) `
+				conditionInherit += ` AND a.seller_id_last  IN (` + sellerId + `) `
+			}
 		}
 		condition += " AND  a.product_id = 2  AND  a.status = 1  AND  a.start_date >= ?  AND  a.start_date <= ?  AND a.rai_contract_type = '新签合同' "
 		pars = append(pars, startDate, endDate)
@@ -1457,8 +1471,14 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		var conditionInherit string
 		var parsInherit []interface{}
 		if sellerId != "" {
-			condition += ` AND a.seller_id_last  IN (` + sellerId + `) `
-			conditionInherit += ` AND a.seller_id_last  IN (` + sellerId + `) `
+			if isServerSeller {
+				condition += ` AND a.share_seller_id_last  IN (` + sellerId + `) `
+				conditionInherit += ` AND a.share_seller_id_last  IN (` + sellerId + `) `
+			} else {
+				condition += ` AND a.seller_id_last  IN (` + sellerId + `) `
+				conditionInherit += ` AND a.seller_id_last  IN (` + sellerId + `) `
+			}
+
 		}
 		condition += " AND  a.product_id = 2  AND  a.status = 1  AND  a.start_date >= ?  AND  a.start_date <= ? AND a.rai_contract_type = '新签合同'  "
 		pars = append(pars, startDate, endDate)