fix:路演状态已结束

models/roadshow/calendar.go

@@ -738,15 +738,15 @@ type AdminInfo struct {
 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
+    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.status=6 AND a.sys_user_id != 0 `
+		where c.is_overseas = 0 and  a.english_company= 0 AND a.source = 0  AND b.rs_calendar_researcher_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
-		where aa.english_company= 1 AND aa.source = 0  AND bb.status=6 AND aa.sys_user_id != 0`
+    INNER JOIN rs_report_record  AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
+		where aa.english_company= 1 AND aa.source = 0  AND bb.rs_calendar_researcher_status=2 AND aa.sys_user_id != 0`
 
 	sql := `SELECT n.admin_id,n.real_name FROM (` + sql1 + ` UNION ALL ` + sql2
 	sql += `		) AS m 
@@ -760,15 +760,15 @@ WHERE 1=1 Group by sys_user_id order by sys_user_id asc`
 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
+    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.status=6 AND b.researcher_id != 0`
+		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`
 
 	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
-		where aa.english_company= 1 AND aa.source = 0  AND bb.status=6 AND bb.researcher_id != 0 `
+    INNER JOIN rs_report_record  AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
+		where aa.english_company= 1 AND aa.source = 0  AND bb.rs_calendar_researcher_status=2 AND bb.researcher_id != 0 `
 
 	sql := `SELECT n.admin_id,n.real_name FROM (` + sql1 + ` UNION ALL ` + sql2
 	sql += `		) AS m 
@@ -815,11 +815,11 @@ func GetOverseaCustomCalendarList(keyword, sellerId, researcherId, startDate, en
 	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,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
+    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.status=6 AND b.researcher_id != 0`
+		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 keyword != "" {
 		sql1 += ` AND d.company_name like ? `
@@ -842,9 +842,9 @@ func GetOverseaCustomCalendarList(keyword, sellerId, researcherId, startDate, en
 	}
 
 	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 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.status=6 AND bb.researcher_id != 0 `, databaseName)
+		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 keyword != "" {
 		sql2 += ` AND cc.company_name like ? `