fix

models/roadshow/calendar.go

@@ -7,6 +7,7 @@ import (
 	"hongze/hz_crm_api/models/company"
 	"hongze/hz_crm_api/models/system"
 	"hongze/hz_crm_api/utils"
+	"strings"
 	"time"
 )
 
@@ -738,9 +739,10 @@ func GetOverseaCustomCalendarSellerList() (list []*AdminInfo, err error) {
 	o := orm.NewOrm()
 	sql1 := `SELECT a.sys_user_id FROM  rs_calendar AS a
     INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id=b.rs_calendar_id
-        LEFT JOIN company_product AS c ON a.company_id=c.company_id AND c.product_id=1
-        LEFT JOIN company AS d ON c.company_id=d.company_id 
-		where d.region_type= "海外" and  a.english_company= 0 AND a.source = 0  AND b.status=2 AND a.sys_user_id != 0 `
+         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.status=2 AND a.sys_user_id != 0 `
 
 	sql2 := `SELECT aa.sys_user_id FROM  rs_calendar AS aa
     INNER JOIN rs_calendar_researcher AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
@@ -759,9 +761,10 @@ func GetOverseaCustomCalendarResearcherList() (list []*AdminInfo, err error) {
 	o := orm.NewOrm()
 	sql1 := `SELECT b.researcher_id FROM  rs_calendar AS a
     INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id=b.rs_calendar_id
-        LEFT JOIN company_product AS c ON a.company_id=c.company_id AND c.product_id=1
-        LEFT JOIN company AS d ON c.company_id=d.company_id 
-		where d.region_type= "海外" and  a.english_company= 0 AND a.source = 0  AND b.status=2 AND b.researcher_id != 0`
+         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.status=2 AND b.researcher_id != 0`
 
 	sql2 := `SELECT bb.researcher_id FROM  rs_calendar AS aa
     INNER JOIN rs_calendar_researcher AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
@@ -783,6 +786,8 @@ type OverseaCustomRecordInfoResp struct {
 
 type OverseaCustomRecordInfo struct {
 	RsCalendarId     int
+	CompanyId        int
+	Source           int
 	RoadshowType     string
 	RoadshowPlatform string
 	SellerName       string
@@ -799,14 +804,21 @@ func GetOverseaCustomCalendarList(keyword, sellerId, researcherId, startDate, en
 	} 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 d.company_name,d.overseas_status company_status,b.start_date,a.rs_calendar_id,a.roadshow_type,a.roadshow_platform,a.sys_user_real_name seller_name,b.researcher_name as base_researcher_name FROM  rs_calendar AS a
+	sql1 := `SELECT d.company_name,d.overseas_status company_status,b.start_date,a.rs_calendar_id,a.roadshow_type,a.roadshow_platform,a.sys_user_real_name seller_name,b.researcher_name as base_researcher_name,2 AS source,d.company_id FROM  rs_calendar AS a
     INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id=b.rs_calendar_id
-        LEFT JOIN company_product AS c ON a.company_id=c.company_id AND c.product_id=1
-        LEFT JOIN company AS d ON c.company_id=d.company_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.status=2 AND b.researcher_id != 0`
 
 	if keyword != "" {
@@ -824,12 +836,12 @@ func GetOverseaCustomCalendarList(keyword, sellerId, researcherId, startDate, en
 		sql1 += ` AND b.start_date <= ? `
 		pars = append(pars, endDate)
 	}
-	if companyStatus != "" {
-		sql1 += ` AND d.overseas_status = ? `
-		pars = append(pars, companyStatus)
+	if lenCompanyStatusList > 0 {
+		sql1 += ` AND d.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
 	}
 
-	sql2 := fmt.Sprintf(`SELECT cc.company_name,cc.overseas_status company_status,bb.start_date,aa.rs_calendar_id,aa.roadshow_type,aa.roadshow_platform,aa.sys_user_real_name seller_name,bb.researcher_name as base_researcher_name FROM rs_calendar AS aa
+	sql2 := fmt.Sprintf(`SELECT cc.company_name,cc.overseas_status company_status,bb.start_date,aa.rs_calendar_id,aa.roadshow_type,aa.roadshow_platform,aa.sys_user_real_name seller_name,bb.researcher_name as base_researcher_name,1 AS source,cc.company_id+10000000 FROM rs_calendar AS aa
     INNER JOIN rs_calendar_researcher 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.status=2 AND bb.researcher_id != 0 `, databaseName)
@@ -849,9 +861,9 @@ func GetOverseaCustomCalendarList(keyword, sellerId, researcherId, startDate, en
 		sql2 += ` AND bb.start_date <= ?  `
 		pars = append(pars, endDate)
 	}
-	if companyStatus != "" {
-		sql2 += ` AND cc.overseas_status = ? `
-		pars = append(pars, companyStatus)
+	if lenCompanyStatusList > 0 {
+		sql2 += ` AND cc.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
+		pars = append(pars, companyStatusList)
 	}
 	rsCalendarIdList := make([]int, 0)
 	if researcherId != `` {