no message

controllers/roadshow/report.go

@@ -463,7 +463,6 @@ func (this *CalendarController) SellerReportList() {
 		tmpGroupSalonNumMap := make(map[int]int)
 		for _, researcher := range groupMap[v.GroupId] {
 			//组内研究员数据
-
 			//每个区间的数据
 			tmpAdminRsReportRecordNumList := make([]roadshow.RsReportRecordNum, 0)
 			for index, adminData := range adminDataList {

services/roadshow/report.go

@@ -327,6 +327,9 @@ func getSellerSectionData(startDate, endDate time.Time, dimensionType string) (a
 	meetingMap := make(map[int]int)
 	onlineMap := make(map[int]int)
 	offlineMap := make(map[int]int)
+	roadShowMap := make(map[int]int) // 路演总次数
+	salonMap := make(map[int]int)    //沙龙路演次数
+
 	//fmt.Println()
 	//客户状态维度
 	if dimensionType == "company_status" {
@@ -479,14 +482,53 @@ func getSellerSectionData(startDate, endDate time.Time, dimensionType string) (a
 		}
 	}
 
+	//权益路演
+	if dimensionType == "roadshow_rai" {
+		//路演总次数
+		{
+			var condition string
+			var pars []interface{}
+			condition = ` and start_date >= ? and end_date <= ? and activity_type = ? `
+			pars = append(pars, startDate, endDate, "路演")
+			data, tmpErr := roadshow.GetGroupSellerRecordList(condition, pars)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			for _, v := range data {
+				//fmt.Println(v)
+				roadShowMap[v.AdminId] = v.Num
+			}
+		}
+
+		//沙龙路演次数
+		{
+			var condition string
+			var pars []interface{}
+			condition = ` and start_date >= ? and end_date <= ? and activity_type = ? `
+			pars = append(pars, startDate, endDate, "沙龙")
+			data, tmpErr := roadshow.GetGroupSellerRecordList(condition, pars)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			for _, v := range data {
+				//fmt.Println(v)
+				salonMap[v.AdminId] = v.Num
+			}
+		}
+	}
+
 	adminDataMap = AdminDataMap{
-		TryOutMap:  tryOutMap,
-		FormalMap:  formalMap,
-		MeetingMap: meetingMap,
-		OfflineMap: offlineMap,
-		OnlineMap:  onlineMap,
-		StartDate:  startDate.Format(utils.FormatDate),
-		EndDate:    endDate.Format(utils.FormatDate),
+		TryOutMap:   tryOutMap,
+		FormalMap:   formalMap,
+		MeetingMap:  meetingMap,
+		OfflineMap:  offlineMap,
+		OnlineMap:   onlineMap,
+		RoadShowMap: roadShowMap,
+		SalonMap:    salonMap,
+		StartDate:   startDate.Format(utils.FormatDate),
+		EndDate:     endDate.Format(utils.FormatDate),
 	}
 	return
 }