|
|
@@ -926,7 +926,7 @@ func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, c
|
|
|
|
|
|
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
|
|
|
+ sql1 := `SELECT b.seller_id,b.seller_name,b.researcher_name,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
|
|
|
@@ -951,7 +951,7 @@ func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, c
|
|
|
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
|
|
|
+ sql2 := fmt.Sprintf(`SELECT bb.seller_id,bb.seller_name,bb.researcher_name,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)
|
zwxi