|
|
@@ -360,11 +360,11 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
|
|
|
|
|
|
pars := make([]interface{}, 0)
|
|
|
|
|
|
- sql1 := `SELECT count( * ) num,a.rs_calendar_id,b.seller_id as admin_id,b.seller_group_id as group_id,b.seller_name AS admin_name FROM rs_calendar AS a
|
|
|
+ sql1 := `SELECT DISTINCT a.rs_calendar_id,count( * ) num,a.rs_calendar_id,b.seller_id as admin_id,b.seller_group_id as group_id,b.seller_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
|
|
|
- INNER JOIN overseas_custom_seller AS f ON c.seller_id=f.seller_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.rs_calendar_researcher_status=2 AND b.researcher_id != 0`
|
|
|
|
|
|
if startDate != "" {
|
|
|
@@ -379,9 +379,9 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
|
|
|
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( * ) num,aa.rs_calendar_id,bb.seller_id as admin_id,bb.seller_group_id as group_id,bb.seller_name AS admin_name FROM rs_calendar AS aa
|
|
|
+ sql2 := fmt.Sprintf(`SELECT DISTINCT aa.rs_calendar_id,count( * ) num,aa.rs_calendar_id,bb.seller_id as admin_id,bb.seller_group_id as group_id,bb.seller_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)
|
|
|
@@ -398,7 +398,7 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
|
|
|
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.*,SUM(m.num) AS num FROM (` + sql1 + ` UNION ALL ` + sql2
|
zwxi