|
|
@@ -5,6 +5,7 @@ import (
|
|
|
"github.com/rdlucklib/rdluck_tools/paging"
|
|
|
"hongze/hz_crm_api/models"
|
|
|
"hongze/hz_crm_api/models/company"
|
|
|
+ "hongze/hz_crm_api/models/cygx"
|
|
|
"hongze/hz_crm_api/models/roadshow"
|
|
|
"hongze/hz_crm_api/models/system"
|
|
|
"hongze/hz_crm_api/services"
|
|
|
@@ -21,6 +22,7 @@ import (
|
|
|
// @Param DataType query string true "枚举值：week、month、time_interval"
|
|
|
// @Param StartDate query string true "开始日期,格式：2022-04-06"
|
|
|
// @Param EndDate query string true "结束日期,格式：2022-04-06"
|
|
|
+// @Param CompanyType query string true "客户类型：'ficc','权益',传空默认为ficc,"
|
|
|
// @Success 200 {object} roadshow.RsReportRecordResp
|
|
|
// @router /report/researcher/list [get]
|
|
|
func (this *CalendarController) ResearcherReportList() {
|
|
|
@@ -39,7 +41,7 @@ func (this *CalendarController) ResearcherReportList() {
|
|
|
dataType := this.GetString("DataType")
|
|
|
startDate := this.GetString("StartDate")
|
|
|
endDate := this.GetString("EndDate")
|
|
|
-
|
|
|
+ companyType := this.GetString("CompanyType", "ficc")
|
|
|
var adminDataList []roadshowService.AdminDataMap
|
|
|
var err error
|
|
|
//var firstDate time.Time
|
|
|
@@ -71,19 +73,74 @@ func (this *CalendarController) ResearcherReportList() {
|
|
|
br.ErrMsg = "数据异常，Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
- group, err := roadshow.GetResearcherGroup()
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取信息失败！"
|
|
|
- br.ErrMsg = "获取分组信息失败！Err:" + err.Error()
|
|
|
- return
|
|
|
}
|
|
|
- researcherList, err := roadshow.GetResearcherV2()
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取信息失败！"
|
|
|
- br.ErrMsg = "获取分组信息失败！,GetResearcherV2 Err:" + err.Error()
|
|
|
- return
|
|
|
+
|
|
|
+ var group []*roadshow.ResearcherGroup
|
|
|
+ var researcherList []*roadshow.ResearcherGroup
|
|
|
+
|
|
|
+ switch companyType {
|
|
|
+ case utils.COMPANY_CLASSIFY_FICC:
|
|
|
+ group, err = roadshow.GetResearcherGroup()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败！"
|
|
|
+ br.ErrMsg = "获取分组信息失败！Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ researcherList, err = roadshow.GetResearcherV2()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败！"
|
|
|
+ br.ErrMsg = "获取分组信息失败！,GetResearcherV2 Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ case utils.COMPANY_CLASSIFY_RAI:
|
|
|
+ mapPermissionUser := make(map[string][]*roadshow.ResearcherGroup)
|
|
|
+ listPermission, err := cygx.GetChartPermissionAll()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ mapPermissionId := make(map[string]int)
|
|
|
+ for _, v := range listPermission {
|
|
|
+ mapPermissionId[v.PermissionName] = v.ChartPermissionId
|
|
|
+ }
|
|
|
+ askUserList, err := cygx.GetAskEmailListResearcher()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取失败,GetAskEmailListResearcher Err: " + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ sysUserList, err := system.GetAdminList()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取admin列表失败, Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ adminMap := make(map[int]*system.Admin, 0)
|
|
|
+ for _, v := range sysUserList {
|
|
|
+ adminMap[v.AdminId] = v
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, v := range askUserList {
|
|
|
+ if admin, ok := adminMap[v.AdminId]; ok {
|
|
|
+ item := &roadshow.ResearcherGroup{
|
|
|
+ AdminId: v.AdminId,
|
|
|
+ RealName: v.Name,
|
|
|
+ GroupId: mapPermissionId[v.ChartPermissionName], //行业ID作为组别，进行关系映射
|
|
|
+ GroupName: admin.GroupName,
|
|
|
+ RoleTypeCode: admin.RoleTypeCode,
|
|
|
+ }
|
|
|
+ mapPermissionUser[v.ChartPermissionName] = append(mapPermissionUser[v.ChartPermissionName], item)
|
|
|
+ researcherList = append(researcherList, item)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for k, v := range mapPermissionUser {
|
|
|
+ respItem := new(roadshow.ResearcherGroup)
|
|
|
+ respItem.GroupName = k + "组"
|
|
|
+ respItem.GroupId = mapPermissionId[k]
|
|
|
+ respItem.ResearcherList = v
|
|
|
+ group = append(group, respItem)
|
|
|
+ }
|
|
|
}
|
|
|
groupMap := make(map[int][]*roadshow.ResearcherGroup)
|
|
|
for _, v := range researcherList {
|
|
|
@@ -120,24 +177,30 @@ func (this *CalendarController) ResearcherReportList() {
|
|
|
tmpAllTryOutNumMap := make(map[int]int)
|
|
|
tmpAllFormalNumMap := make(map[int]int)
|
|
|
tmpAllMeetingNumMap := make(map[int]int)
|
|
|
+ tmpAllRoadShowNumMap := make(map[int]int)
|
|
|
+ tmpAllSalonNumMap := make(map[int]int)
|
|
|
for _, v := range group {
|
|
|
v.ResearcherList = groupMap[v.GroupId]
|
|
|
tmpGroupAdminReportRecord := make([]roadshow.AdminReportRecord, 0)
|
|
|
tmpGroupRsReportRecordNumList := make([]roadshow.RsReportRecordNum, 0)
|
|
|
|
|
|
+ //roadShowMap := make(map[int]int) // 路演总次数
|
|
|
+ //salonMap := make(map[int]int) //沙龙路演次数
|
|
|
+
|
|
|
tmpGroupTryOutNumMap := make(map[int]int)
|
|
|
tmpGroupFormalNumMap := make(map[int]int)
|
|
|
tmpGroupMeetingNumMap := make(map[int]int)
|
|
|
+ tmpGroupRoadShowNumMap := make(map[int]int)
|
|
|
+ tmpGroupSalonMapNumMap := make(map[int]int)
|
|
|
for _, researcher := range groupMap[v.GroupId] {
|
|
|
//组内研究员数据
|
|
|
-
|
|
|
//每个区间的数据
|
|
|
tmpAdminRsReportRecordNumList := make([]roadshow.RsReportRecordNum, 0)
|
|
|
for index, adminData := range adminDataList {
|
|
|
startDateIndexList[index] = adminData.StartDate
|
|
|
endDateIndexList[index] = adminData.EndDate
|
|
|
|
|
|
- var tmpTryOutNum, tmpFormalNum, tmpMeetingNum int
|
|
|
+ var tmpTryOutNum, tmpFormalNum, tmpMeetingNum, tmpRoadShowNum, tmpSalonNum int
|
|
|
if num, ok := adminData.TryOutMap[researcher.AdminId]; ok {
|
|
|
tmpTryOutNum = num
|
|
|
}
|
|
|
@@ -147,12 +210,21 @@ func (this *CalendarController) ResearcherReportList() {
|
|
|
if num, ok := adminData.MeetingMap[researcher.AdminId]; ok {
|
|
|
tmpMeetingNum = num
|
|
|
}
|
|
|
+ if num, ok := adminData.RoadShowMap[researcher.AdminId]; ok { //路演总次数
|
|
|
+ tmpRoadShowNum = num
|
|
|
+ }
|
|
|
+ if num, ok := adminData.SalonMap[researcher.AdminId]; ok { //路演总次数
|
|
|
+ tmpSalonNum = num
|
|
|
+ }
|
|
|
+
|
|
|
tmpAdminRsReportRecordNum := roadshow.RsReportRecordNum{
|
|
|
- TryOutNum: tmpTryOutNum,
|
|
|
- FormalNum: tmpFormalNum,
|
|
|
- MeetingNum: tmpMeetingNum,
|
|
|
- StartDate: adminData.StartDate,
|
|
|
- EndDate: adminData.EndDate,
|
|
|
+ TryOutNum: tmpTryOutNum,
|
|
|
+ FormalNum: tmpFormalNum,
|
|
|
+ MeetingNum: tmpMeetingNum,
|
|
|
+ RoadShowNum: tmpRoadShowNum,
|
|
|
+ SalonNum: tmpSalonNum,
|
|
|
+ StartDate: adminData.StartDate,
|
|
|
+ EndDate: adminData.EndDate,
|
|
|
}
|
|
|
tmpAdminRsReportRecordNumList = append(tmpAdminRsReportRecordNumList, tmpAdminRsReportRecordNum)
|
|
|
|
|
|
@@ -166,9 +238,17 @@ func (this *CalendarController) ResearcherReportList() {
|
|
|
if _, ok := tmpGroupMeetingNumMap[index]; !ok {
|
|
|
tmpGroupMeetingNumMap[index] = 0
|
|
|
}
|
|
|
+ if _, ok := tmpGroupRoadShowNumMap[index]; !ok {
|
|
|
+ tmpGroupRoadShowNumMap[index] = 0
|
|
|
+ }
|
|
|
+ if _, ok := tmpGroupSalonMapNumMap[index]; !ok {
|
|
|
+ tmpGroupSalonMapNumMap[index] = 0
|
|
|
+ }
|
|
|
tmpGroupTryOutNumMap[index] += tmpTryOutNum
|
|
|
tmpGroupFormalNumMap[index] += tmpFormalNum
|
|
|
tmpGroupMeetingNumMap[index] += tmpMeetingNum
|
|
|
+ tmpGroupRoadShowNumMap[index] += tmpRoadShowNum
|
|
|
+ tmpGroupSalonMapNumMap[index] += tmpSalonNum
|
|
|
|
|
|
//总数据汇总
|
|
|
if _, ok := tmpAllTryOutNumMap[index]; !ok {
|
|
|
@@ -180,9 +260,17 @@ func (this *CalendarController) ResearcherReportList() {
|
|
|
if _, ok := tmpAllMeetingNumMap[index]; !ok {
|
|
|
tmpAllMeetingNumMap[index] = 0
|
|
|
}
|
|
|
+ if _, ok := tmpGroupRoadShowNumMap[index]; !ok {
|
|
|
+ tmpGroupRoadShowNumMap[index] = 0
|
|
|
+ }
|
|
|
+ if _, ok := tmpGroupSalonMapNumMap[index]; !ok {
|
|
|
+ tmpGroupSalonMapNumMap[index] = 0
|
|
|
+ }
|
|
|
tmpAllTryOutNumMap[index] += tmpTryOutNum
|
|
|
tmpAllFormalNumMap[index] += tmpFormalNum
|
|
|
tmpAllMeetingNumMap[index] += tmpMeetingNum
|
|
|
+ tmpAllRoadShowNumMap[index] += tmpRoadShowNum
|
|
|
+ tmpAllSalonNumMap[index] += tmpSalonNum
|
|
|
}
|
|
|
tmpAdminReportRecord := roadshow.AdminReportRecord{
|
|
|
Name: researcher.RealName,
|
|
|
@@ -194,11 +282,13 @@ func (this *CalendarController) ResearcherReportList() {
|
|
|
|
|
|
for i := 0; i < len(tmpGroupMeetingNumMap); i++ {
|
|
|
tmpGroupRsReportRecordNum := roadshow.RsReportRecordNum{
|
|
|
- TryOutNum: tmpGroupTryOutNumMap[i],
|
|
|
- FormalNum: tmpGroupFormalNumMap[i],
|
|
|
- MeetingNum: tmpGroupMeetingNumMap[i],
|
|
|
- StartDate: startDateIndexList[i],
|
|
|
- EndDate: endDateIndexList[i],
|
|
|
+ TryOutNum: tmpGroupTryOutNumMap[i],
|
|
|
+ FormalNum: tmpGroupFormalNumMap[i],
|
|
|
+ MeetingNum: tmpGroupMeetingNumMap[i],
|
|
|
+ RoadShowNum: tmpGroupRoadShowNumMap[i],
|
|
|
+ SalonNum: tmpGroupSalonMapNumMap[i],
|
|
|
+ StartDate: startDateIndexList[i],
|
|
|
+ EndDate: endDateIndexList[i],
|
|
|
}
|
|
|
tmpGroupRsReportRecordNumList = append(tmpGroupRsReportRecordNumList, tmpGroupRsReportRecordNum)
|
|
|
}
|
|
|
@@ -213,11 +303,13 @@ func (this *CalendarController) ResearcherReportList() {
|
|
|
//总体汇总数据
|
|
|
for i := 0; i < len(tmpAllFormalNumMap); i++ {
|
|
|
tmpGroupRsReportRecordNum := roadshow.RsReportRecordNum{
|
|
|
- TryOutNum: tmpAllTryOutNumMap[i],
|
|
|
- FormalNum: tmpAllFormalNumMap[i],
|
|
|
- MeetingNum: tmpAllMeetingNumMap[i],
|
|
|
- StartDate: startDateIndexList[i],
|
|
|
- EndDate: endDateIndexList[i],
|
|
|
+ TryOutNum: tmpAllTryOutNumMap[i],
|
|
|
+ FormalNum: tmpAllFormalNumMap[i],
|
|
|
+ MeetingNum: tmpAllMeetingNumMap[i],
|
|
|
+ RoadShowNum: tmpAllRoadShowNumMap[i],
|
|
|
+ SalonNum: tmpAllSalonNumMap[i],
|
|
|
+ StartDate: startDateIndexList[i],
|
|
|
+ EndDate: endDateIndexList[i],
|
|
|
}
|
|
|
rsAllReportRecordNumList = append(rsAllReportRecordNumList, tmpGroupRsReportRecordNum)
|
|
|
}
|
|
|
@@ -237,6 +329,7 @@ func (this *CalendarController) ResearcherReportList() {
|
|
|
// @Param DimensionType query string true "维度枚举值：company_status、roadshow_type"
|
|
|
// @Param StartDate query string true "开始日期,格式：2022-04-06"
|
|
|
// @Param EndDate query string true "结束日期,格式：2022-04-06"
|
|
|
+// @Param CompanyType query string true "客户类型：'ficc','权益',传空默认为ficc,"
|
|
|
// @Success 200 {object} roadshow.RsReportRecordResp
|
|
|
// @router /report/seller/list [get]
|
|
|
func (this *CalendarController) SellerReportList() {
|
|
|
@@ -256,10 +349,13 @@ func (this *CalendarController) SellerReportList() {
|
|
|
dimensionType := this.GetString("DimensionType")
|
|
|
startDate := this.GetString("StartDate")
|
|
|
endDate := this.GetString("EndDate")
|
|
|
-
|
|
|
+ companyType := this.GetString("CompanyType", "ficc")
|
|
|
if dimensionType == "" {
|
|
|
dimensionType = "company_status"
|
|
|
}
|
|
|
+ if companyType == utils.COMPANY_CLASSIFY_RAI {
|
|
|
+ dimensionType = "roadshow_rai" // 类型传了权益，就强制查询权益的路演
|
|
|
+ }
|
|
|
|
|
|
var adminDataList []roadshowService.AdminDataMap
|
|
|
var err error
|
|
|
@@ -294,13 +390,34 @@ func (this *CalendarController) SellerReportList() {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- group, groupIdRelationMap, err := services.GetFiccSystemGroup()
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取信息失败！"
|
|
|
- br.ErrMsg = "获取分组信息失败！Err:" + err.Error()
|
|
|
- return
|
|
|
+
|
|
|
+ var group []services.AdminGroup
|
|
|
+ var groupIdRelationMap map[int]int
|
|
|
+ var researcherList []*roadshow.Researcher
|
|
|
+ switch companyType {
|
|
|
+ case utils.COMPANY_CLASSIFY_FICC:
|
|
|
+ group, groupIdRelationMap, err = services.GetFiccSystemGroup()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败！"
|
|
|
+ br.ErrMsg = "获取FICC销售信息失败！Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ researcherList, err = services.GetFiccSeller(firstDate, groupIdRelationMap)
|
|
|
+ case utils.COMPANY_CLASSIFY_RAI:
|
|
|
+ group, groupIdRelationMap, err = services.GetRaiSystemGroup()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败！"
|
|
|
+ br.ErrMsg = "获取分组信息失败！Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ researcherList, err = services.GetRaiSeller(groupIdRelationMap)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败！"
|
|
|
+ br.ErrMsg = "获取权益销售信息失败！Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
- researcherList, err := services.GetFiccSeller(firstDate, groupIdRelationMap)
|
|
|
+
|
|
|
groupMap := make(map[int][]*roadshow.Researcher)
|
|
|
for _, v := range researcherList {
|
|
|
if v.RoleTypeCode == "ficc_admin" {
|
|
|
@@ -333,6 +450,8 @@ func (this *CalendarController) SellerReportList() {
|
|
|
tmpAllMeetingNumMap := make(map[int]int)
|
|
|
tmpAllOnlineNumMap := make(map[int]int)
|
|
|
tmpAllOfflineNumMap := make(map[int]int)
|
|
|
+ tmpAllRoadShowNumMap := make(map[int]int)
|
|
|
+ tmpAllSalonNumMap := make(map[int]int)
|
|
|
for _, v := range group {
|
|
|
v.ResearcherList = groupMap[v.GroupId]
|
|
|
tmpGroupAdminReportRecord := make([]roadshow.AdminReportRecord, 0)
|
|
|
@@ -343,16 +462,17 @@ func (this *CalendarController) SellerReportList() {
|
|
|
tmpGroupMeetingNumMap := make(map[int]int)
|
|
|
tmpGroupOnlineNumMap := make(map[int]int)
|
|
|
tmpGroupOfflineNumMap := make(map[int]int)
|
|
|
+ tmpGroupRoadShowNumMap := make(map[int]int)
|
|
|
+ tmpGroupSalonNumMap := make(map[int]int)
|
|
|
for _, researcher := range groupMap[v.GroupId] {
|
|
|
//组内研究员数据
|
|
|
-
|
|
|
//每个区间的数据
|
|
|
tmpAdminRsReportRecordNumList := make([]roadshow.RsReportRecordNum, 0)
|
|
|
for index, adminData := range adminDataList {
|
|
|
startDateIndexList[index] = adminData.StartDate
|
|
|
endDateIndexList[index] = adminData.EndDate
|
|
|
|
|
|
- var tmpTryOutNum, tmpFormalNum, tmpMeetingNum, tmpOnlineNum, tmpOfflineNum int
|
|
|
+ var tmpTryOutNum, tmpFormalNum, tmpMeetingNum, tmpOnlineNum, tmpOfflineNum, tmpRoadShowNum, tmpSalonNum int
|
|
|
if num, ok := adminData.TryOutMap[researcher.AdminId]; ok {
|
|
|
tmpTryOutNum = num
|
|
|
}
|
|
|
@@ -368,14 +488,22 @@ func (this *CalendarController) SellerReportList() {
|
|
|
if num, ok := adminData.OfflineMap[researcher.AdminId]; ok {
|
|
|
tmpOfflineNum = num
|
|
|
}
|
|
|
+ if num, ok := adminData.RoadShowMap[researcher.AdminId]; ok {
|
|
|
+ tmpRoadShowNum = num
|
|
|
+ }
|
|
|
+ if num, ok := adminData.SalonMap[researcher.AdminId]; ok {
|
|
|
+ tmpSalonNum = num
|
|
|
+ }
|
|
|
tmpAdminRsReportRecordNum := roadshow.RsReportRecordNum{
|
|
|
- TryOutNum: tmpTryOutNum,
|
|
|
- FormalNum: tmpFormalNum,
|
|
|
- MeetingNum: tmpMeetingNum,
|
|
|
- OnlineNum: tmpOnlineNum,
|
|
|
- OfflineNum: tmpOfflineNum,
|
|
|
- StartDate: adminData.StartDate,
|
|
|
- EndDate: adminData.EndDate,
|
|
|
+ TryOutNum: tmpTryOutNum,
|
|
|
+ FormalNum: tmpFormalNum,
|
|
|
+ MeetingNum: tmpMeetingNum,
|
|
|
+ OnlineNum: tmpOnlineNum,
|
|
|
+ OfflineNum: tmpOfflineNum,
|
|
|
+ RoadShowNum: tmpRoadShowNum,
|
|
|
+ SalonNum: tmpSalonNum,
|
|
|
+ StartDate: adminData.StartDate,
|
|
|
+ EndDate: adminData.EndDate,
|
|
|
}
|
|
|
tmpAdminRsReportRecordNumList = append(tmpAdminRsReportRecordNumList, tmpAdminRsReportRecordNum)
|
|
|
|
|
|
@@ -395,11 +523,19 @@ func (this *CalendarController) SellerReportList() {
|
|
|
if _, ok := tmpGroupOfflineNumMap[index]; !ok {
|
|
|
tmpGroupOfflineNumMap[index] = 0
|
|
|
}
|
|
|
+ if _, ok := tmpGroupRoadShowNumMap[index]; !ok {
|
|
|
+ tmpGroupRoadShowNumMap[index] = 0
|
|
|
+ }
|
|
|
+ if _, ok := tmpGroupSalonNumMap[index]; !ok {
|
|
|
+ tmpGroupSalonNumMap[index] = 0
|
|
|
+ }
|
|
|
tmpGroupTryOutNumMap[index] += tmpTryOutNum
|
|
|
tmpGroupFormalNumMap[index] += tmpFormalNum
|
|
|
tmpGroupMeetingNumMap[index] += tmpMeetingNum
|
|
|
tmpGroupOnlineNumMap[index] += tmpOnlineNum
|
|
|
tmpGroupOfflineNumMap[index] += tmpOfflineNum
|
|
|
+ tmpGroupRoadShowNumMap[index] += tmpRoadShowNum
|
|
|
+ tmpGroupSalonNumMap[index] += tmpSalonNum
|
|
|
|
|
|
//总数据汇总
|
|
|
if _, ok := tmpAllTryOutNumMap[index]; !ok {
|
|
|
@@ -417,11 +553,19 @@ func (this *CalendarController) SellerReportList() {
|
|
|
if _, ok := tmpAllOfflineNumMap[index]; !ok {
|
|
|
tmpAllOfflineNumMap[index] = 0
|
|
|
}
|
|
|
+ if _, ok := tmpAllRoadShowNumMap[index]; !ok {
|
|
|
+ tmpAllRoadShowNumMap[index] = 0
|
|
|
+ }
|
|
|
+ if _, ok := tmpAllSalonNumMap[index]; !ok {
|
|
|
+ tmpAllSalonNumMap[index] = 0
|
|
|
+ }
|
|
|
tmpAllTryOutNumMap[index] += tmpTryOutNum
|
|
|
tmpAllFormalNumMap[index] += tmpFormalNum
|
|
|
tmpAllMeetingNumMap[index] += tmpMeetingNum
|
|
|
tmpAllOnlineNumMap[index] += tmpOnlineNum
|
|
|
tmpAllOfflineNumMap[index] += tmpOfflineNum
|
|
|
+ tmpAllRoadShowNumMap[index] += tmpRoadShowNum
|
|
|
+ tmpAllSalonNumMap[index] += tmpSalonNum
|
|
|
}
|
|
|
tmpAdminReportRecord := roadshow.AdminReportRecord{
|
|
|
Name: researcher.RealName,
|
|
|
@@ -433,13 +577,15 @@ func (this *CalendarController) SellerReportList() {
|
|
|
|
|
|
for i := 0; i < len(tmpGroupMeetingNumMap); i++ {
|
|
|
tmpGroupRsReportRecordNum := roadshow.RsReportRecordNum{
|
|
|
- TryOutNum: tmpGroupTryOutNumMap[i],
|
|
|
- FormalNum: tmpGroupFormalNumMap[i],
|
|
|
- MeetingNum: tmpGroupMeetingNumMap[i],
|
|
|
- OnlineNum: tmpGroupOnlineNumMap[i],
|
|
|
- OfflineNum: tmpGroupOfflineNumMap[i],
|
|
|
- StartDate: startDateIndexList[i],
|
|
|
- EndDate: endDateIndexList[i],
|
|
|
+ TryOutNum: tmpGroupTryOutNumMap[i],
|
|
|
+ FormalNum: tmpGroupFormalNumMap[i],
|
|
|
+ MeetingNum: tmpGroupMeetingNumMap[i],
|
|
|
+ OnlineNum: tmpGroupOnlineNumMap[i],
|
|
|
+ OfflineNum: tmpGroupOfflineNumMap[i],
|
|
|
+ RoadShowNum: tmpGroupRoadShowNumMap[i],
|
|
|
+ SalonNum: tmpGroupSalonNumMap[i],
|
|
|
+ StartDate: startDateIndexList[i],
|
|
|
+ EndDate: endDateIndexList[i],
|
|
|
}
|
|
|
tmpGroupRsReportRecordNumList = append(tmpGroupRsReportRecordNumList, tmpGroupRsReportRecordNum)
|
|
|
}
|
|
|
@@ -455,13 +601,15 @@ func (this *CalendarController) SellerReportList() {
|
|
|
//总体汇总数据
|
|
|
for i := 0; i < len(tmpAllFormalNumMap); i++ {
|
|
|
tmpGroupRsReportRecordNum := roadshow.RsReportRecordNum{
|
|
|
- TryOutNum: tmpAllTryOutNumMap[i],
|
|
|
- FormalNum: tmpAllFormalNumMap[i],
|
|
|
- MeetingNum: tmpAllMeetingNumMap[i],
|
|
|
- OnlineNum: tmpAllOnlineNumMap[i],
|
|
|
- OfflineNum: tmpAllOfflineNumMap[i],
|
|
|
- StartDate: startDateIndexList[i],
|
|
|
- EndDate: endDateIndexList[i],
|
|
|
+ TryOutNum: tmpAllTryOutNumMap[i],
|
|
|
+ FormalNum: tmpAllFormalNumMap[i],
|
|
|
+ MeetingNum: tmpAllMeetingNumMap[i],
|
|
|
+ OnlineNum: tmpAllOnlineNumMap[i],
|
|
|
+ OfflineNum: tmpAllOfflineNumMap[i],
|
|
|
+ RoadShowNum: tmpAllRoadShowNumMap[i],
|
|
|
+ SalonNum: tmpAllSalonNumMap[i],
|
|
|
+ StartDate: startDateIndexList[i],
|
|
|
+ EndDate: endDateIndexList[i],
|
|
|
}
|
|
|
rsAllReportRecordNumList = append(rsAllReportRecordNumList, tmpGroupRsReportRecordNum)
|
|
|
}
|
|
|
@@ -571,6 +719,12 @@ func (this *CalendarController) ReportCalendarList() {
|
|
|
case "offline":
|
|
|
condition += ` and a.roadshow_type = ? `
|
|
|
pars = append(pars, "线下")
|
|
|
+ case "road_show":
|
|
|
+ condition += ` and a.activity_type = ? `
|
|
|
+ pars = append(pars, "路演")
|
|
|
+ case "salon":
|
|
|
+ condition += ` and a.activity_type = ? `
|
|
|
+ pars = append(pars, "沙龙")
|
|
|
default:
|
|
|
br.Msg = "请传入类型"
|
|
|
br.ErrMsg = "请传入类型DataType"
|
|
|
@@ -1715,4 +1869,4 @@ func (this *CalendarController) OverseasCalendarList() {
|
|
|
br.Msg = "获取成功"
|
|
|
br.Data = list
|
|
|
return
|
|
|
-}
|
|
|
+}
|
zqbao