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

@@ -875,8 +875,9 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		}
 
 		item := new(statistic_report.RaiDataSummaryDetailResp)
+		item.TbaleNameAText = "金额续约率"
 		item.RenewedContractMoney = fmt.Sprint(utils.SubFloatToString(renewedContractMoney, 2))
-		item.ExpiredContractMoney = fmt.Sprint(renewedContractCompany)
+		item.ExpiredContractMoney = fmt.Sprint(utils.SubFloatToString(expiredContractMoney, 2))
 		if renewedContractMoney == 0 || expiredContractMoney == 0 {
 			item.RenewalRate = "0%"
 		} else {
@@ -886,7 +887,8 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		listResp = append(listResp, item)
 
 		item2 := new(statistic_report.RaiDataSummaryDetailResp)
-		item2.RenewedContractMoney = fmt.Sprint(utils.SubFloatToString(expiredContractMoney, 2))
+		item2.TbaleNameAText = "客户续约率"
+		item2.RenewedContractMoney = fmt.Sprint(renewedContractCompany)
 		item2.ExpiredContractMoney = fmt.Sprint(expiredContractCompany)
 		if renewedContractCompany == 0 || expiredContractCompany == 0 {
 			item2.RenewalRate = "0%"
@@ -996,8 +998,9 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		}
 
 		item := new(statistic_report.RaiDataSummaryDetailResp)
+		item.TbaleNameAText = "金额不续约率"
 		item.RenewedContractMoney = fmt.Sprint(utils.SubFloatToString(norenewedContractMoney, 2))
-		item.ExpiredContractMoney = fmt.Sprint(norenewedContractCompany)
+		item.ExpiredContractMoney = fmt.Sprint(utils.SubFloatToString(expiredContractMoney, 2))
 		if norenewedContractMoney == 0 || expiredContractMoney == 0 {
 			item.RenewalRate = "0%"
 		} else {
@@ -1006,7 +1009,8 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		listResp = append(listResp, item)
 
 		item2 := new(statistic_report.RaiDataSummaryDetailResp)
-		item2.RenewedContractMoney = fmt.Sprint(utils.SubFloatToString(expiredContractMoney, 2))
+		item2.TbaleNameAText = "客户不续约率"
+		item2.RenewedContractMoney = fmt.Sprint(norenewedContractCompany)
 		item2.ExpiredContractMoney = fmt.Sprint(expiredContractCompany)
 		if norenewedContractCompany == 0 || expiredContractCompany == 0 {
 			item2.RenewalRate = "0%"

models/statistic_report/rai_data_summary.go

@@ -147,4 +147,5 @@ type RaiDataSummaryDetailResp struct {
 	InvoicedAmount         float64 ` description:"开票金额"`
 	PaymentAmount          float64 ` description:"到款金额"`
 	NotReceivedtAmount     float64 ` description:"未到账金额"`
+	TbaleNameAText         string  ` description:"表格A列占位符"` //配合前端渲染使用，没有啥实际意义
 }