no message

controllers/statistic/rai_data_summary.go

@@ -185,7 +185,17 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	mapNewCustomerInvoicingMoney := make(map[string]float64)        // 财务系统新客开票金额（金额)
 	mapNewCustomerPaymentsReceivedMoney := make(map[string]float64) // 财务系统新客到款金额（金额)
 
+	mapExpiredContractNumServer := make(map[string]int) // 到期合同（数量)
+	//mapExpiredContractCompanyNumServer := make(map[string]int)         // 到期公司（数量)
+	//mapRenewedContractMoneyServer := make(map[string]float64)          // 续约合同（金额)
+	//mapRenewedContractNumServer := make(map[string]int)                // 续约合同（数量)
+	//mapRenewedContractCompanyNumServer := make(map[string]int)         // 续约公司（数量)
+	//confirmedNoRenewalContractMoneyServer := make(map[string]float64)  // 确认不续约合同（金额)
+	//confirmedNoRenewalContractNumServer := make(map[string]int)        // 确认不续约合同（数量)
+	//confirmedNoRenewalContractCompanyNumServer := make(map[string]int) // 确认不续约公司（数量)
+
 	var keyMap string
+	var keyMapServer string
 	var keyMapTtoal string
 	var keyMapTtoalServer string
 	var keyMapCompany string
@@ -274,6 +284,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		}
 
 		keyMap = fmt.Sprint(yearStr, "_", v.SellerIdLast)
+		keyMapServer = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_", v.SellerIdLast, "_CID_", v.CompanyId)
 		keySigned = fmt.Sprint(yearStr, "_", "_CID_", v.CompanyId, "_SID_", v.SellerIdLast)
 		if sellerDevelopIds[v.SellerIdLast] == true {
@@ -284,12 +295,13 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 		//续约合同 数据
 		mapRenewedContractMoney[keyMap] += v.Money
-
 		mapRenewedContractMoney[keyMapTtoal] += v.Money
 
 		mapSignedClientMoney[keyMap] += v.Money
 		mapSignedClientMoney[keyMapTtoal] += v.Money
 
+		mapExpiredContractNumServer[keyMapServer]++
+
 		//一家公司同一个时间纬度，只统计一次
 		//if !mapKeyMapCompanyData[keyMapCompany] {
 		mapRenewedContractNum[keyMap]++
@@ -484,6 +496,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 	resp := new(statistic_report.RaiDataSummaryListResp)
 	var items []*statistic_report.RaiDataSummaryResp
+
 	for i := startYear; i <= endYear; i++ {
 		//if len(dataTypeArr) > 0 {
 		for _, Dv := range dataTypeArr {
@@ -610,6 +623,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 			}
 
 			for _, vS := range sellerService {
+				keyMap = fmt.Sprint(item.DataType, "_", vS.AdminId)
 				sellerItem := new(statistic_report.RaiDataSummaryDetail)
 				sellerItem.SellerId = strconv.Itoa(vS.AdminId)
 				sellerServiceIds = append(sellerServiceIds, sellerItem.SellerId)

models/statistic_report/rai_data_summary.go

@@ -80,15 +80,16 @@ type IncrementalList struct {
 	PermissionNameStatus string                             `description:"权限状态"`
 	CompanyProductStatus string                             `description:"客户状态"`
 	//CompanyContractIdGroup string                             `description:"表company_contract合并的 company_contract_id"`
-	IsUserMaker     int    `description:"近四周之内是否包含决策人互动过 ，0否，1是"`
-	SellerNameInit  string `description:"权益初始化销售"`
-	SellerIdInit    int    `description:"权益初始化销售ID"`
-	SellerIdLast    int    `description:"合同到期之前最后所属销售ID"`
-	ShareSellerInit string `description:"共享销售员"`
-	SysRealName     string `description:"操作者名称"`
-	Operation       string `description:"操作"`
-	RaiContractType string `description:"权益合同类型：枚举值：'新签合同','续约合同','补充协议'"`
-	InheritEndDate  string `description:"所继承上一份合同的结束日期，权益自定义续约合同统计使用"`
+	IsUserMaker       int    `description:"近四周之内是否包含决策人互动过 ，0否，1是"`
+	SellerNameInit    string `description:"权益初始化销售"`
+	SellerIdInit      int    `description:"权益初始化销售ID"`
+	SellerIdLast      int    `description:"合同到期之前最后所属销售ID"`
+	ShareSellerInit   string `description:"共享销售员"`
+	ShareSellerIdLast int    `description:"合同到期之前最后共享销售员ID"`
+	SysRealName       string `description:"操作者名称"`
+	Operation         string `description:"操作"`
+	RaiContractType   string `description:"权益合同类型：枚举值：'新签合同','续约合同','补充协议'"`
+	InheritEndDate    string `description:"所继承上一份合同的结束日期，权益自定义续约合同统计使用"`
 }
 
 // GetRaiDataSummaryList 获取增量客户报表列表数据（根据合同来展示）