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

controllers/statistic/rai_data_summary.go

@@ -177,7 +177,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	mapRenewedContractCompanyNum := make(map[string]int)            // 续约公司（数量)
 	confirmedNoRenewalContractMoney := make(map[string]float64)     // 确认不续约合同（金额)
 	confirmedNoRenewalContractNum := make(map[string]int)           // 确认不续约合同（数量)
-	confirmedNoRenewalComapnyNum := make(map[string]int)            // 确认不续约公司（数量)
+	confirmedNoRenewalContractCompanyNum := make(map[string]int)    // 确认不续约公司（数量)
 	mapSignedClientNum := make(map[string]int)                      // 签约客户（数量)
 	mapSignedClientMoney := make(map[string]float64)                // 签约客户（金额)
 	mapInvoiceAmountMoney := make(map[string]float64)               // 财务系统开票金额（金额)
@@ -245,7 +245,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 			mapCompanyData[keySigned] = true
 		}
 	}
-	//fmt.Println(mapSignedClientNum)
 
 	//续约部分的数据
 	mapKeyMapCompanyData := make(map[string]bool)
@@ -373,8 +372,8 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 			//}
 
 			if !mapKeyMapCompanyNoData[keyMapCompanyNo] {
-				confirmedNoRenewalComapnyNum[keyMap]++
-				confirmedNoRenewalComapnyNum[keyMapTtoal]++
+				confirmedNoRenewalContractCompanyNum[keyMap]++
+				confirmedNoRenewalContractCompanyNum[keyMapTtoal]++
 				mapKeyMapCompanyNoData[keyMapCompanyNo] = true
 			}
 
@@ -478,8 +477,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		}
 		mapAddTrialNum[keyMapTtoal]++
 	}
-	fmt.Println(mapExpiredContractCompanyNum)
-	fmt.Println(confirmedNoRenewalContractNum)
+
 	resp := new(statistic_report.RaiDataSummaryListResp)
 	var items []*statistic_report.RaiDataSummaryResp
 	for i := startYear; i <= endYear; i++ {
@@ -523,10 +521,10 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 				} else {
 					confirmNonRenewalRateMoey = utils.SubFloatToString(confirmedNoRenewalContractMoney[keyMap]/mapExpiredContractMoney[keyMap]*100, 2) + "%"
 				}
-				if confirmedNoRenewalComapnyNum[keyMap] == 0 || mapExpiredContractCompanyNum[keyMap] == 0 {
+				if confirmedNoRenewalContractCompanyNum[keyMap] == 0 || mapExpiredContractCompanyNum[keyMap] == 0 {
 					confirmNonRenewalRateNum = "0%"
 				} else {
-					confirmNonRenewalRateNum = utils.SubFloatToString(float64(confirmedNoRenewalComapnyNum[keyMap])/float64(mapExpiredContractCompanyNum[keyMap])*100, 2) + "%"
+					confirmNonRenewalRateNum = utils.SubFloatToString(float64(confirmedNoRenewalContractCompanyNum[keyMap])/float64(mapExpiredContractCompanyNum[keyMap])*100, 2) + "%"
 				}
 				sellerItem.ConfirmNonRenewalRateData = fmt.Sprint(confirmNonRenewalRateMoey, " / ", confirmNonRenewalRateNum) //确认不续约率（金额/数量)-(数据)"
 
@@ -581,10 +579,10 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 				} else {
 					confirmNonRenewalRateMoey = utils.SubFloatToString(confirmedNoRenewalContractMoney[keyMapTtoal]/mapExpiredContractMoney[keyMapTtoal]*100, 2) + "%"
 				}
-				if confirmedNoRenewalComapnyNum[keyMapTtoal] == 0 || mapExpiredContractCompanyNum[keyMapTtoal] == 0 {
+				if confirmedNoRenewalContractCompanyNum[keyMapTtoal] == 0 || mapExpiredContractCompanyNum[keyMapTtoal] == 0 {
 					confirmNonRenewalRateNum = "0%"
 				} else {
-					confirmNonRenewalRateNum = utils.SubFloatToString(float64(confirmedNoRenewalComapnyNum[keyMapTtoal])/float64(mapExpiredContractCompanyNum[keyMapTtoal])*100, 2) + "%"
+					confirmNonRenewalRateNum = utils.SubFloatToString(float64(confirmedNoRenewalContractCompanyNum[keyMapTtoal])/float64(mapExpiredContractCompanyNum[keyMapTtoal])*100, 2) + "%"
 				}
 				sellerItem.ConfirmNonRenewalRateData = fmt.Sprint(confirmNonRenewalRateMoey, " / ", confirmNonRenewalRateNum) //确认不续约率（金额/数量)-(数据)"
 
@@ -638,10 +636,10 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 				} else {
 					confirmNonRenewalRateMoey = utils.SubFloatToString(confirmedNoRenewalContractMoney[keyMap]/mapExpiredContractMoney[keyMap]*100, 2) + "%"
 				}
-				if confirmedNoRenewalComapnyNum[keyMap] == 0 || mapExpiredContractCompanyNum[keyMap] == 0 {
+				if confirmedNoRenewalContractCompanyNum[keyMap] == 0 || mapExpiredContractCompanyNum[keyMap] == 0 {
 					confirmNonRenewalRateNum = "0%"
 				} else {
-					confirmNonRenewalRateNum = utils.SubFloatToString(float64(confirmedNoRenewalComapnyNum[keyMap])/float64(mapExpiredContractCompanyNum[keyMap])*100, 2) + "%"
+					confirmNonRenewalRateNum = utils.SubFloatToString(float64(confirmedNoRenewalContractCompanyNum[keyMap])/float64(mapExpiredContractCompanyNum[keyMap])*100, 2) + "%"
 				}
 				sellerItem.ConfirmNonRenewalRateData = fmt.Sprint(confirmNonRenewalRateMoey, " / ", confirmNonRenewalRateNum) //确认不续约率（金额/数量)-(数据)"
 
@@ -695,10 +693,10 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 				} else {
 					confirmNonRenewalRateMoey = utils.SubFloatToString(confirmedNoRenewalContractMoney[keyMapTtoalServer]/mapExpiredContractMoney[keyMapTtoalServer]*100, 2) + "%"
 				}
-				if confirmedNoRenewalComapnyNum[keyMapTtoalServer] == 0 || mapExpiredContractCompanyNum[keyMapTtoalServer] == 0 {
+				if confirmedNoRenewalContractCompanyNum[keyMapTtoalServer] == 0 || mapExpiredContractCompanyNum[keyMapTtoalServer] == 0 {
 					confirmNonRenewalRateNum = "0%"
 				} else {
-					confirmNonRenewalRateNum = utils.SubFloatToString(float64(confirmedNoRenewalComapnyNum[keyMapTtoalServer])/float64(mapExpiredContractCompanyNum[keyMapTtoalServer])*100, 2) + "%"
+					confirmNonRenewalRateNum = utils.SubFloatToString(float64(confirmedNoRenewalContractCompanyNum[keyMapTtoalServer])/float64(mapExpiredContractCompanyNum[keyMapTtoalServer])*100, 2) + "%"
 				}
 				sellerItem.ConfirmNonRenewalRateData = fmt.Sprint(confirmNonRenewalRateMoey, " / ", confirmNonRenewalRateNum) //确认不续约率（金额/数量)-(数据)"
 
@@ -1048,7 +1046,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			br.ErrMsg = "获取数据信息失败,Err:" + err.Error()
 			return
 		}
-		//fmt.Println("listRaiData", len(listRaiData))
 
 		//到期合同数据
 		conditionEnd += ` AND  a.status = 1  AND a.end_date >= ?  AND a.end_date <= ?   AND a.end_date < ? `
@@ -1276,7 +1273,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			br.ErrMsg = "获取数据信息失败,Err:" + err.Error()
 			return
 		}
-		fmt.Println("listInheritData", len(listInheritData))
 
 		var renewedContractCompany int // 续约客户数
 		var renewedContract int        // 续约合同数