|
|
@@ -379,7 +379,7 @@ 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 seller_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
|
|
|
INNER JOIN rs_report_record AS bb ON aa.rs_calendar_id=bb.rs_calendar_id
|
|
|
@@ -398,14 +398,14 @@ 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 seller_id `
|
|
|
|
|
|
// 列表数据
|
|
|
sql := `SELECT m.* FROM (` + sql1 + ` UNION ALL ` + sql2
|
|
|
sql += ` ) AS m WHERE 1=1 `
|
|
|
|
|
|
|
|
|
- sql += ` Group by rs_calendar_id `
|
|
|
+ //sql += ` Group by rs_calendar_id `
|
|
|
_, err = o.Raw(sql, pars).QueryRows(&list)
|
|
|
|
|
|
return
|
zwxi