Merge branch 'CRM_15.6'

models/roadshow/calendar.go

@@ -926,7 +926,7 @@ func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, c
 
 	pars := make([]interface{}, 0)
 
-	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
+	sql1 := `SELECT a.start_date,a.end_date,a.start_time,a.end_time,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 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
+	sql2 := fmt.Sprintf(`SELECT aa.start_date,aa.end_date,aa.start_time,aa.end_time,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)

models/roadshow/report_record.go

@@ -293,12 +293,12 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
 
 	pars := make([]interface{}, 0)
 
-	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
+	sql1 := `SELECT count( * ) 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
     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
-		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`
+		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 != "" {
 		sql1 += ` AND b.start_date >= ? `
@@ -312,8 +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 `
 
-	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
+	sql2 := fmt.Sprintf(`SELECT count( * ) 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)
@@ -330,18 +331,12 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
 		sql2 += ` AND cc.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
 		pars = append(pars, companyStatusList)
 	}
-	rsCalendarIdList := make([]int, 0)
-
-	rsCalendarIdNum := len(rsCalendarIdList)
+	sql2 += ` GROUP BY admin_id `
 
 	// 列表数据
-	sql := `SELECT m.*,count(1) num  FROM (` + sql1 + ` UNION ALL ` + sql2
+	sql := `SELECT m.*  FROM (` + sql1 + ` UNION ALL ` + sql2
 	sql += ` ) AS m  WHERE 1=1 `
 
-	if rsCalendarIdNum > 0 {
-		sql += fmt.Sprintf(` AND rs_calendar_id IN (` + utils.GetOrmInReplace(rsCalendarIdNum) + `)`)
-	}
-
 	sql += ` Group by rs_calendar_id `
 	_, err = o.Raw(sql, pars).QueryRows(&list)
 
@@ -365,7 +360,7 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
 
 	pars := make([]interface{}, 0)
 
-	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
+	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
     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 
@@ -384,8 +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 `
 
-	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
+	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
     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)
@@ -402,9 +398,10 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
 		sql2 += ` AND cc.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
 		pars = append(pars, companyStatusList)
 	}
+	sql2 += ` GROUP BY admin_id `
 
 	// 列表数据
-	sql := `SELECT m.*,count(1) num  FROM (` + sql1 + ` UNION ALL ` + sql2
+	sql := `SELECT m.*  FROM (` + sql1 + ` UNION ALL ` + sql2
 	sql += ` ) AS m  WHERE 1=1 `