|
|
@@ -293,7 +293,7 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
|
|
|
|
|
|
pars := make([]interface{}, 0)
|
|
|
|
|
|
- sql1 := `SELECT COUNT(1) AS num,a.rs_calendar_id,b.researcher_id as admin_id,b.researcher_group_id as group_id,b.researcher_name AS admin_name FROM rs_calendar AS a
|
|
|
+ sql1 := `SELECT ,a.rs_calendar_id,b.researcher_id as admin_id,b.researcher_group_id as group_id,b.researcher_name AS admin_name 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
|
|
|
@@ -312,9 +312,9 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
|
|
|
sql1 += ` AND d.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
|
|
|
pars = append(pars, companyStatusList)
|
|
|
}
|
|
|
- sql1 += ` GROUP BY admin_id `
|
|
|
+ //sql1 += ` GROUP BY admin_id `
|
|
|
|
|
|
- sql2 := fmt.Sprintf(`SELECT COUNT(1) 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 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)
|
|
|
@@ -331,10 +331,10 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
|
|
|
sql2 += ` AND cc.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
|
|
|
pars = append(pars, companyStatusList)
|
|
|
}
|
|
|
- sql2 += ` GROUP BY admin_id `
|
|
|
+ //sql2 += ` GROUP BY admin_id `
|
|
|
|
|
|
// 列表数据
|
|
|
- sql := `SELECT m.* FROM (` + sql1 + ` UNION ALL ` + sql2
|
|
|
+ sql := `SELECT m.*,count(1) as sum FROM (` + sql1 + ` UNION ALL ` + sql2
|
|
|
sql += ` ) AS m WHERE 1=1 `
|
|
|
|
|
|
sql += ` Group by admin_id `
|
zwxi