|
@@ -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
|