no message

controllers/statistic/rai_data_summary.go

@@ -862,6 +862,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 				} else if v.Operation == "receive" || v.Operation == "apply_receive" {
 					item.AddType = "领取"
 				}
+				item.CompanyId = v.CompanyId
 				item.CompanyName = v.CompanyName
 				item.SellerName = v.SellerName
 				item.CreateTime = v.CreateTime
@@ -908,6 +909,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			}
 			for _, v := range tmpList {
 				item := new(statistic_report.RaiDataSummaryDetailResp)
+				item.CompanyId = v.CompanyId
 				item.CompanyName = v.CompanyName
 				item.SellerName = v.SellerNameInit
 				item.StartDate = v.StartDate
@@ -943,7 +945,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		}
 		trialTotal = total
 		//列表页数据
-		tmpList, err := models.GetIncrementalCompanyMergeList(condition, pars, startSize, pageSize)
+		tmpList, err := models.GetIncrementalCompanyMergeListEnd(condition, pars, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -964,6 +966,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			}
 			for _, v := range tmpList {
 				item := new(statistic_report.RaiDataSummaryDetailResp)
+				item.CompanyId = v.CompanyId
 				item.CompanyName = v.CompanyName
 				item.SellerName = v.SellerNameLast
 				item.StartDate = v.StartDate
@@ -1017,6 +1020,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			}
 			for _, v := range tmpList {
 				item := new(statistic_report.RaiDataSummaryDetailResp)
+				item.CompanyId = v.CompanyId
 				item.CompanyName = v.CompanyName
 				item.SellerName = v.SellerNameLast
 				item.StartDate = v.StartDate
@@ -1156,6 +1160,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			}
 			for _, v := range tmpList {
 				item := new(statistic_report.RaiDataSummaryDetailResp)
+				item.CompanyId = v.CompanyId
 				item.CompanyName = v.CompanyName
 				item.SellerName = v.SellerNameInit
 				item.StartDate = v.StartDate

models/statistic_report/rai_data_summary.go

@@ -157,6 +157,7 @@ type RaiDataSummaryPopupTypeResp struct {
 
 // 增量客户统计报表列表数据结构
 type RaiDataSummaryDetailResp struct {
+	CompanyId              int     `description:"企业客户ID"`
 	CompanyName            string  `description:"企业客户名称"`
 	SellerName             string  `description:"归属销售名称"`
 	AddType                string  `description:"新增类型"`