fix

models/roadshow/calendar.go

@@ -926,7 +926,7 @@ func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, c
 
 	pars := make([]interface{}, 0)
 
-	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
+	sql1 := `SELECT a.rs_calendar_id,b.seller_id,b.seller_name,b.researcher_name,b.company_name,b.company_id,d.overseas_status as company_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) `, researcherId)
 	}
-	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
+	sql2 := fmt.Sprintf(`SELECT aa.rs_calendar_id,bb.seller_id,bb.seller_name,bb.researcher_name,aa.company_name,aa.company_id,cc.overseas_status as company_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)
@@ -980,7 +980,7 @@ func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, c
 	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

models/roadshow/report_record.go

@@ -293,7 +293,7 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
 
 	pars := make([]interface{}, 0)
 
-	sql1 := `SELECT 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 
@@ -313,7 +313,7 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
 		pars = append(pars, companyStatusList)
 	}
 
-	sql2 := fmt.Sprintf(`SELECT 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)
@@ -342,7 +342,7 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
 		sql += fmt.Sprintf(` AND rs_calendar_id IN (` + utils.GetOrmInReplace(rsCalendarIdNum) + `)`)
 	}
 
-	//sql += ` Group by rs_calendar_id `
+	sql += ` Group by rs_calendar_id `
 	_, err = o.Raw(sql, pars).QueryRows(&list)
 
 	return
@@ -365,7 +365,7 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
 
 	pars := make([]interface{}, 0)
 
-	sql1 := `SELECT 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 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 
@@ -385,7 +385,7 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
 		pars = append(pars, companyStatusList)
 	}
 
-	sql2 := fmt.Sprintf(`SELECT 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 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)
@@ -408,7 +408,7 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
 	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