no message

controllers/statistic/rai_data_summary.go

@@ -181,7 +181,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	var keyMapTtoal string
 	var keyMapTtoalServer string
 	var keyMapCompany string
-	var keyMapCompanyNo string
+	//var keyMapCompanyNo string
 	var keySigned string
 
 	mapCompanyData := make(map[string]bool)
@@ -212,7 +212,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		}
 
 		keyMap = fmt.Sprint(yearStr, "_", v.SellerIdLast)
-		keySigned = fmt.Sprint(yearStr, "_", "_CID_", v.CompanyId)
+		keySigned = fmt.Sprint(yearStr, "_", "_CID_", v.CompanyId, "_SID_", v.SellerIdLast)
 
 		if sellerDevelopIds[v.SellerIdLast] == true {
 			keyMapTtoal = fmt.Sprint(yearStr, "_Develop")
@@ -260,6 +260,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 			mapCompanyData[keySigned] = true
 		}
 	}
+	//fmt.Println(mapSignedClientNum)
 
 	//续约部分的数据
 	mapKeyMapCompanyData := make(map[string]bool)
@@ -315,8 +316,8 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	}
 
 	//确认不续约、到期合同部分的数据
-	mapKeyMapCompanyEndData := make(map[string]bool)
-	mapKeyMapCompanyNoData := make(map[string]bool)
+	//mapKeyMapCompanyEndData := make(map[string]bool)
+	//mapKeyMapCompanyNoData := make(map[string]bool)
 	for _, v := range listEndData {
 		if !mapsellerId[v.SellerIdLast] {
 			continue
@@ -344,7 +345,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 		keyMap = fmt.Sprint(yearStr, "_", v.SellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_", v.SellerIdLast, "_CID_", v.CompanyId)
-		keyMapCompanyNo = fmt.Sprint(yearStr, "_", v.SellerIdLast, "_CID_NO", v.CompanyId)
+		//keyMapCompanyNo = fmt.Sprint(yearStr, "_", v.SellerIdLast, "_CID_NO", v.CompanyId)
 		if sellerDevelopIds[v.SellerIdLast] == true {
 			keyMapTtoal = fmt.Sprint(yearStr, "_Develop")
 		} else {
@@ -356,11 +357,11 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		mapExpiredContractMoney[keyMapTtoal] += v.Money
 
 		//一家公司同一个时间纬度，只统计一次
-		if !mapKeyMapCompanyEndData[keyMapCompany] {
-			mapExpiredContractNum[keyMap]++
-			mapExpiredContractNum[keyMapTtoal]++
-			mapKeyMapCompanyEndData[keyMapCompany] = true
-		}
+		//if !mapKeyMapCompanyEndData[keyMapCompany] {
+		mapExpiredContractNum[keyMap]++
+		mapExpiredContractNum[keyMapTtoal]++
+		//mapKeyMapCompanyEndData[keyMapCompany] = true
+		//}
 
 		if mapNoRenewedcompanyContractIds[v.CompanyContractId] { // 确认不续约合同
 			confirmedNoRenewalContractMoney[keyMap] += v.Money
@@ -368,11 +369,11 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 			confirmedNoRenewalContractMoney[keyMapTtoal] += v.Money
 
 			//一家公司同一个时间纬度，只统计一次
-			if !mapKeyMapCompanyNoData[keyMapCompanyNo] {
-				confirmedNoRenewalContractNum[keyMap]++
-				confirmedNoRenewalContractNum[keyMapTtoal]++
-				mapKeyMapCompanyNoData[keyMapCompanyNo] = true
-			}
+			//if !mapKeyMapCompanyNoData[keyMapCompanyNo] {
+			confirmedNoRenewalContractNum[keyMap]++
+			confirmedNoRenewalContractNum[keyMapTtoal]++
+			//mapKeyMapCompanyNoData[keyMapCompanyNo] = true
+			//}
 		}
 	}