|
|
@@ -314,7 +314,7 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
|
|
|
}
|
|
|
sql1 += ` GROUP BY admin_id `
|
|
|
|
|
|
- sql2 := fmt.Sprintf(`SELECT COUNT(DISTINCT a.rs_calendar_id) AS num,aa.rs_calendar_id,bb.researcher_id as admin_id,bb.researcher_group_id as group_id,bb.researcher_name AS admin_name FROM rs_calendar AS aa
|
|
|
+ sql2 := fmt.Sprintf(`SELECT COUNT(DISTINCT aa.rs_calendar_id) AS num,aa.rs_calendar_id,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)
|
|
|
@@ -337,7 +337,7 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
|
|
|
sql := `SELECT m.* FROM (` + sql1 + ` UNION ALL ` + sql2
|
|
|
sql += ` ) AS m WHERE 1=1 `
|
|
|
|
|
|
- sql += ` Group by rs_calendar_id `
|
|
|
+ sql += ` Group by admin_id `
|
|
|
_, err = o.Raw(sql, pars).QueryRows(&list)
|
|
|
|
|
|
return
|
zwxi