zwxi 10 months ago
parent
commit
2bdfaf6f63
4 changed files with 299 additions and 101 deletions
  1. 33 54
      controllers/roadshow/report.go
  2. 77 0
      models/roadshow/calendar.go
  3. 143 1
      models/roadshow/report_record.go
  4. 46 46
      services/roadshow/report.go

+ 33 - 54
controllers/roadshow/report.go

@@ -5,7 +5,6 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/company"
-	"hongze/hz_crm_api/models/overseas_custom"
 	"hongze/hz_crm_api/models/roadshow"
 	"hongze/hz_crm_api/models/system"
 	"hongze/hz_crm_api/services"
@@ -1649,78 +1648,58 @@ func (this *CalendarController) OverseasCalendarList() {
 		return
 	}
 
-	adminIdsArr := make([]int, 0)
-	adminIdSlice := strings.Split(adminIds, ",")
-	for _, v := range adminIdSlice {
-		id,_ := strconv.Atoi(v)
-		adminIdsArr = append(adminIdsArr, id)
-	}
-
-	//客户状态维度
-	companylist, err := overseas_custom.GetOverseasCustomList("", nil)
-	if err != nil {
-		return
-	}
-	formalIdsArr := make([]int, 0)
-	tryoutIdsArr := make([]int, 0)
-	closeIdsArr := make([]int, 0)
-	for _, v := range companylist {
-		if v.OverseasStatus == "正式" {
-			formalIdsArr = append(formalIdsArr, v.CompanyId)
-		} else if v.OverseasStatus == "试用" {
-			tryoutIdsArr = append(tryoutIdsArr, v.CompanyId)
-		} else if v.OverseasStatus == "关闭" {
-			closeIdsArr = append(closeIdsArr, v.CompanyId)
-		}
-	}
+	//adminIdsArr := make([]int, 0)
+	//adminIdSlice := strings.Split(adminIds, ",")
+	//for _, v := range adminIdSlice {
+	//	id,_ := strconv.Atoi(v)
+	//	adminIdsArr = append(adminIdsArr, id)
+	//}
 
 	//正式客户
-	var condition string
-	var pars []interface{}
-	condition = ` and a.start_date >= ? and a.end_date <= ? `
-	pars = append(pars, startDate, endDate)
+	//var condition string
+	//var pars []interface{}
+	//condition = ` and a.start_date >= ? and a.end_date <= ? `
+	//pars = append(pars, startDate, endDate)
 
+	var sellerIds, researcherIds string
 	//选择的人员类型(发起人还是被发起人)
 	if adminType == "seller" {
-		condition += ` and a.seller_id IN (` + utils.GetOrmInReplace(len(adminIdsArr)) + `)`
-	} else if adminType == "special" {
-		condition += ` and a.seller_id (` + utils.GetOrmInReplace(len(adminIdsArr)) + `)`
-		detail, err := company.GetConfigDetailByCode("choice_researcher_adminid")
-		if err != nil {
-			br.Msg = "获取研究员信息失败!"
-			br.ErrMsg = "选择研究员失败,Err:" + err.Error()
-			return
-		}
-		condition += ` and a.researcher_id IN (` + detail.ConfigValue + `) `
+		//condition += ` and a.seller_id IN (` + utils.GetOrmInReplace(len(adminIdsArr)) + `)`
+		sellerIds = adminIds
 	} else {
-		condition += ` and a.researcher_id IN (` + utils.GetOrmInReplace(len(adminIdsArr)) + `)`
+		//condition += ` and a.researcher_id IN (` + utils.GetOrmInReplace(len(adminIdsArr)) + `)`
+		researcherIds = adminIds
 	}
-	pars = append(pars, adminIdsArr)
+	//pars = append(pars, adminIdsArr)
 
+	var status string
 	//获取列表
 	switch dataType {
 	case "try_out":
-		condition += ` and a.company_status = ? and a.company_id IN (` + utils.GetOrmInReplace(len(tryoutIdsArr)) + `)`
-		pars = append(pars, "试用", tryoutIdsArr)
+		//condition += ` and a.company_status = ? )`
+		//pars = append(pars, "试用")
+		status = "试用"
 	case "formal":
-		condition += ` and a.company_status = ? and a.company_id IN (` + utils.GetOrmInReplace(len(formalIdsArr)) + `)`
-		pars = append(pars, "正式", formalIdsArr)
+		//condition += ` and a.company_status = ? )`
+		//pars = append(pars, "正式")
+		status = "正式"
 	case "close":
-		condition += ` and a.company_status = ? and a.company_id IN (` + utils.GetOrmInReplace(len(closeIdsArr)) + `)`
-		pars = append(pars, "关闭", closeIdsArr)
-	case "online":
-		condition += ` and a.roadshow_type = ? `
-		pars = append(pars, "线上")
-	case "offline":
-		condition += ` and a.roadshow_type = ? `
-		pars = append(pars, "线下")
+		//condition += ` and a.company_status = ? )`
+		//pars = append(pars, "关闭")
+		status = "关闭"
+	//case "online":
+	//	condition += ` and a.roadshow_type = ? `
+	//	pars = append(pars, "线上")
+	//case "offline":
+	//	condition += ` and a.roadshow_type = ? `
+	//	pars = append(pars, "线下")
 	default:
 		br.Msg = "请传入类型"
 		br.ErrMsg = "请传入类型DataType"
 		return
 	}
 
-	list, err := roadshow.GetRsReportRecordList(condition, pars)
+	list, err := roadshow.GetOverseaCustomCalendarList2(sellerIds, researcherIds, startDate, endDate, status)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,ERR:" + err.Error()

+ 77 - 0
models/roadshow/calendar.go

@@ -908,3 +908,80 @@ func GetOverseaCustomCalendarList(keyword, sellerId, researcherId, startDate, en
 
 	return
 }
+
+func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, companyStatus string) (list []*RsReportRecordList, err error) {
+	var databaseName string
+	if utils.RunMode == "debug" {
+		databaseName = "test_v2_hongze_rddp"
+	} else {
+		databaseName = "hongze_rddp"
+	}
+	companyStatusList := make([]string, 0)
+	if companyStatus != "" {
+		companyStatusList = strings.Split(companyStatus, ",")
+	}
+	lenCompanyStatusList := len(companyStatusList)
+
+	o := orm.NewOrm()
+
+	pars := make([]interface{}, 0)
+
+	sql1 := `SELECT b.company_name,b.company_id,d.overseas_status,b.roadshow_type,a.theme,a.roadshow_platform,a.province as province,a.city as city FROM  rs_calendar AS a
+    INNER JOIN rs_report_record  AS b ON a.rs_calendar_id=b.rs_calendar_id
+         JOIN company_product AS c ON a.company_id=c.company_id AND c.product_id=1
+         JOIN company AS d ON c.company_id=d.company_id 
+				INNER JOIN overseas_custom_seller AS f ON c.seller_id=f.seller_id
+		where c.is_overseas = 0 and  a.english_company= 0 AND a.source = 0  AND b.rs_calendar_researcher_status=2 AND b.researcher_id != 0`
+
+	if startDate != "" {
+		sql1 += ` AND b.start_date >= ? `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql1 += ` AND b.start_date <= ? `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql1 += ` AND d.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+	if sellerId != "" {
+		sql1 += fmt.Sprintf(` AND b.seller_id in (%s) `, sellerId)
+	}
+	if researcherId != "" {
+		sql1 += fmt.Sprintf(` AND b.researcher_id in (%s) `, sellerId)
+	}
+	sql2 := fmt.Sprintf(`SELECT aa.company_name,aa.company_id,cc.overseas_status,bb.roadshow_type,aa.theme,aa.roadshow_platform,aa.province as province,aa.city as city FROM  rs_calendar AS aa
+    INNER JOIN rs_report_record  AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
+    INNER JOIN %s.english_company AS cc ON aa.company_id=cc.company_id
+		where aa.english_company= 1 AND aa.source = 0 AND cc.is_deleted=0  AND bb.rs_calendar_researcher_status=2 AND bb.researcher_id != 0 `, databaseName)
+
+
+	if startDate != "" {
+		sql2 += ` AND bb.start_date >= ?  `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql2 += ` AND bb.start_date <= ?  `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql2 += ` AND cc.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+	if sellerId != "" {
+		sql2 += fmt.Sprintf(` AND bb.seller_id in (%s) `, sellerId)
+	}
+	if researcherId != "" {
+		sql2 += fmt.Sprintf(` AND bb.researcher_id in (%s) `, sellerId)
+	}
+	// 列表数据
+	sql := `SELECT m.*  FROM (` + sql1 + ` UNION ALL ` + sql2
+	sql += ` ) AS m  WHERE 1=1 `
+
+
+	//sql += ` Group by rs_calendar_id  `
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+
+	return
+}

+ 143 - 1
models/roadshow/report_record.go

@@ -1,7 +1,10 @@
 package roadshow
 
 import (
+	"fmt"
 	"github.com/beego/beego/v2/client/orm"
+	"hongze/hz_crm_api/utils"
+	"strings"
 	"time"
 )
 
@@ -231,7 +234,7 @@ func GetBusinessTripList(adminId int, startDate, endDate string) (list []*Busine
 }
 
 // GetOverseasGroupSellerRecordList 获取销售分组数据
-func GetOverseasGroupSellerRecordList(condition string, pars []interface{}) (list []*RsReportRecordGroup, err error) {
+func _GetOverseasGroupSellerRecordList(condition string, pars []interface{}) (list []*RsReportRecordGroup, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT seller_id as admin_id,seller_group_id as group_id,seller_name admin_name,count(1) num
 				FROM  rs_report_record 
@@ -271,3 +274,142 @@ type RsOverseasReportRecordResp struct {
 	RsReportRecordNumList []RsOverseasReportRecordNum `description:"统计次数"`
 }
 
+
+
+func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus string) (list []*RsReportRecordGroup, err error) {
+	var databaseName string
+	if utils.RunMode == "debug" {
+		databaseName = "test_v2_hongze_rddp"
+	} else {
+		databaseName = "hongze_rddp"
+	}
+	companyStatusList := make([]string, 0)
+	if companyStatus != "" {
+		companyStatusList = strings.Split(companyStatus, ",")
+	}
+	lenCompanyStatusList := len(companyStatusList)
+
+	o := orm.NewOrm()
+
+	pars := make([]interface{}, 0)
+
+	sql1 := `SELECT b.researcher_id as admin_id,b.researcher_group_id as group_id,b.researcher_name AS admin_name FROM  rs_calendar AS a
+    INNER JOIN rs_report_record  AS b ON a.rs_calendar_id=b.rs_calendar_id
+         JOIN company_product AS c ON a.company_id=c.company_id AND c.product_id=1
+         JOIN company AS d ON c.company_id=d.company_id 
+				INNER JOIN overseas_custom_seller AS f ON c.seller_id=f.seller_id
+		where c.is_overseas = 0 and  a.english_company= 0 AND a.source = 0  AND b.rs_calendar_researcher_status=2 AND b.researcher_id != 0`
+
+	if startDate != "" {
+		sql1 += ` AND b.start_date >= ? `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql1 += ` AND b.start_date <= ? `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql1 += ` AND d.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+
+	sql2 := fmt.Sprintf(`SELECT bb.researcher_id as admin_id,bb.researcher_group_id as group_id,bb.researcher_name AS admin_name FROM rs_calendar AS aa
+    INNER JOIN rs_report_record  AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
+    INNER JOIN %s.english_company AS cc ON aa.company_id=cc.company_id
+		where aa.english_company= 1 AND aa.source = 0 AND cc.is_deleted=0  AND bb.rs_calendar_researcher_status=2 AND bb.researcher_id != 0 `, databaseName)
+
+	if startDate != "" {
+		sql2 += ` AND bb.start_date >= ?  `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql2 += ` AND bb.start_date <= ?  `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql2 += ` AND cc.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+	rsCalendarIdList := make([]int, 0)
+
+	rsCalendarIdNum := len(rsCalendarIdList)
+
+	// 列表数据
+	sql := `SELECT m.*,count(1) num  FROM (` + sql1 + ` UNION ALL ` + sql2
+	sql += ` ) AS m  WHERE 1=1 `
+
+	if rsCalendarIdNum > 0 {
+		sql += fmt.Sprintf(` AND rs_calendar_id IN (` + utils.GetOrmInReplace(rsCalendarIdNum) + `)`)
+	}
+
+	//sql += ` Group by rs_calendar_id `
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+
+	return
+}
+
+func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string) (list []*RsReportRecordGroup, err error) {
+	var databaseName string
+	if utils.RunMode == "debug" {
+		databaseName = "test_v2_hongze_rddp"
+	} else {
+		databaseName = "hongze_rddp"
+	}
+	companyStatusList := make([]string, 0)
+	if companyStatus != "" {
+		companyStatusList = strings.Split(companyStatus, ",")
+	}
+	lenCompanyStatusList := len(companyStatusList)
+
+	o := orm.NewOrm()
+
+	pars := make([]interface{}, 0)
+
+	sql1 := `SELECT b.seller_id as admin_id,b.seller_group_id as group_id,b.seller_name AS admin_name FROM  rs_calendar AS a
+    INNER JOIN rs_report_record  AS b ON a.rs_calendar_id=b.rs_calendar_id
+         JOIN company_product AS c ON a.company_id=c.company_id AND c.product_id=1
+         JOIN company AS d ON c.company_id=d.company_id 
+				INNER JOIN overseas_custom_seller AS f ON c.seller_id=f.seller_id
+		where c.is_overseas = 0 and  a.english_company= 0 AND a.source = 0  AND b.rs_calendar_researcher_status=2 AND b.researcher_id != 0`
+
+	if startDate != "" {
+		sql1 += ` AND b.start_date >= ? `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql1 += ` AND b.start_date <= ? `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql1 += ` AND d.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+
+	sql2 := fmt.Sprintf(`SELECT bb.seller_id as admin_id,bb.seller_group_id as group_id,bb.seller_name AS admin_name FROM rs_calendar AS aa
+    INNER JOIN rs_report_record  AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
+    INNER JOIN %s.english_company AS cc ON aa.company_id=cc.company_id
+		where aa.english_company= 1 AND aa.source = 0 AND cc.is_deleted=0  AND bb.rs_calendar_researcher_status=2 AND bb.researcher_id != 0 `, databaseName)
+
+	if startDate != "" {
+		sql2 += ` AND bb.start_date >= ?  `
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		sql2 += ` AND bb.start_date <= ?  `
+		pars = append(pars, endDate)
+	}
+	if lenCompanyStatusList > 0 {
+		sql2 += ` AND cc.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
+	}
+
+	// 列表数据
+	sql := `SELECT m.*,count(1) num  FROM (` + sql1 + ` UNION ALL ` + sql2
+	sql += ` ) AS m  WHERE 1=1 `
+
+
+	//sql += ` Group by rs_calendar_id `
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+
+	return
+}

+ 46 - 46
services/roadshow/report.go

@@ -532,11 +532,11 @@ func getOverseasSellerSectionData(startDate, endDate time.Time, dimensionType st
 	if dimensionType == "company_status" {
 		//正式客户
 		{
-			var condition string
-			var pars []interface{}
-			condition = ` and start_date >= ? and end_date <= ?  and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(formalIdsArr)) + `)`
-			pars = append(pars, startDate, endDate, "正式", formalIdsArr)
-			data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(condition, pars)
+			//var condition string
+			//var pars []interface{}
+			//condition = ` and start_date >= ? and end_date <= ?  and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(formalIdsArr)) + `)`
+			//pars = append(pars, startDate, endDate, "正式", formalIdsArr)
+			data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "正式")
 			if tmpErr != nil {
 				err = tmpErr
 				return
@@ -549,11 +549,11 @@ func getOverseasSellerSectionData(startDate, endDate time.Time, dimensionType st
 
 		//试用客户
 		{
-			var condition string
-			var pars []interface{}
-			condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(tryoutIdsArr)) + `)`
-			pars = append(pars, startDate, endDate, "试用", tryoutIdsArr)
-			data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(condition, pars)
+			//var condition string
+			//var pars []interface{}
+			//condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(tryoutIdsArr)) + `)`
+			//pars = append(pars, startDate, endDate, "试用", tryoutIdsArr)
+			data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "试用")
 
 			if tmpErr != nil {
 				err = tmpErr
@@ -567,11 +567,11 @@ func getOverseasSellerSectionData(startDate, endDate time.Time, dimensionType st
 
 		//关闭客户
 		{
-			var condition string
-			var pars []interface{}
-			condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(closeIdsArr)) + `)`
-			pars = append(pars, startDate, endDate, "关闭", closeIdsArr)
-			data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(condition, pars)
+			//var condition string
+			//var pars []interface{}
+			//condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(closeIdsArr)) + `)`
+			//pars = append(pars, startDate, endDate, "关闭", closeIdsArr)
+			data, tmpErr := roadshow.GetOverseasGroupSellerRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "关闭")
 
 			if tmpErr != nil {
 				err = tmpErr
@@ -716,29 +716,29 @@ func getOverseasResearcherSectionData(startDate, endDate time.Time) (adminDataMa
 	formalMap := make(map[int]int)
 	closemap := make(map[int]int)
 
-	companylist, err := overseas_custom.GetOverseasCustomList("", nil)
-	if err != nil {
-		return
-	}
-	formalIdsArr := make([]int, 0)
-	tryoutIdsArr := make([]int, 0)
-	closeIdsArr := make([]int, 0)
-	for _, v := range companylist {
-		if v.OverseasStatus == "正式" {
-			formalIdsArr = append(formalIdsArr, v.CompanyId)
-		} else if v.OverseasStatus == "试用" {
-			tryoutIdsArr = append(tryoutIdsArr, v.CompanyId)
-		} else if v.OverseasStatus == "关闭" {
-			closeIdsArr = append(closeIdsArr, v.CompanyId)
-		}
-	}
+	//companylist, err := overseas_custom.GetOverseasCustomList("", nil)
+	//if err != nil {
+	//	return
+	//}
+	//formalIdsArr := make([]int, 0)
+	//tryoutIdsArr := make([]int, 0)
+	//closeIdsArr := make([]int, 0)
+	//for _, v := range companylist {
+	//	if v.OverseasStatus == "正式" {
+	//		formalIdsArr = append(formalIdsArr, v.CompanyId)
+	//	} else if v.OverseasStatus == "试用" {
+	//		tryoutIdsArr = append(tryoutIdsArr, v.CompanyId)
+	//	} else if v.OverseasStatus == "关闭" {
+	//		closeIdsArr = append(closeIdsArr, v.CompanyId)
+	//	}
+	//}
 	//正式客户
 	{
-		var condition string
-		var pars []interface{}
-		condition = ` and start_date >= ? and end_date <= ?  and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(formalIdsArr)) + `)`
-		pars = append(pars, startDate, endDate, "正式", formalIdsArr)
-		data, tmpErr := roadshow.GetGroupResearcherRecordList(condition, pars)
+		//var condition string
+		//var pars []interface{}
+		//condition = ` and start_date >= ? and end_date <= ?  and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(formalIdsArr)) + `)`
+		//pars = append(pars, startDate, endDate, "正式", formalIdsArr)
+		data, tmpErr := roadshow.GetOverseasGroupResearcherRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "正式")
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -750,11 +750,11 @@ func getOverseasResearcherSectionData(startDate, endDate time.Time) (adminDataMa
 
 	//试用客户
 	{
-		var condition string
-		var pars []interface{}
-		condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(tryoutIdsArr)) + `)`
-		pars = append(pars, startDate, endDate, "试用", tryoutIdsArr)
-		data, tmpErr := roadshow.GetGroupResearcherRecordList(condition, pars)
+		//var condition string
+		//var pars []interface{}
+		//condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(tryoutIdsArr)) + `)`
+		//pars = append(pars, startDate, endDate, "试用", tryoutIdsArr)
+		data, tmpErr := roadshow.GetOverseasGroupResearcherRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "试用")
 
 		if tmpErr != nil {
 			err = tmpErr
@@ -768,11 +768,11 @@ func getOverseasResearcherSectionData(startDate, endDate time.Time) (adminDataMa
 
 	//试用客户
 	{
-		var condition string
-		var pars []interface{}
-		condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(closeIdsArr)) + `)`
-		pars = append(pars, startDate, endDate, "关闭", closeIdsArr)
-		data, tmpErr := roadshow.GetGroupResearcherRecordList(condition, pars)
+		//var condition string
+		//var pars []interface{}
+		//condition = ` and start_date >= ? and end_date <= ? and company_status = ? and company_id IN (` + utils.GetOrmInReplace(len(closeIdsArr)) + `)`
+		//pars = append(pars, startDate, endDate, "关闭", closeIdsArr)
+		data, tmpErr := roadshow.GetOverseasGroupResearcherRecordList(startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate), "关闭")
 		if tmpErr != nil {
 			err = tmpErr
 			return