Merge branch 'CRM_15.6' into debug

models/roadshow/calendar.go

@@ -930,7 +930,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 b.start_date,b.end_date,b.start_time,b.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 
@@ -955,7 +955,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 bb.start_date,bb.end_date,bb.start_time,bb.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)
@@ -984,7 +984,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,27 +293,28 @@ 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 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
     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 >= ? `
 		pars = append(pars, startDate)
 	}
 	if endDate != "" {
-		sql1 += ` AND b.start_date <= ? `
+		sql1 += ` AND b.end_date <= ? `
 		pars = append(pars, endDate)
 	}
 	if lenCompanyStatusList > 0 {
 		sql1 += ` AND d.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
 		pars = append(pars, companyStatusList)
 	}
+	sql1 += ` GROUP BY admin_id `
 
-	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 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
     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)
@@ -323,26 +324,20 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
 		pars = append(pars, startDate)
 	}
 	if endDate != "" {
-		sql2 += ` AND bb.start_date <= ?  `
+		sql2 += ` AND bb.end_date <= ?  `
 		pars = append(pars, endDate)
 	}
 	if lenCompanyStatusList > 0 {
 		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 `
+	sql += ` Group by admin_id `
 	_, err = o.Raw(sql, pars).QueryRows(&list)
 
 	return
@@ -365,11 +360,11 @@ 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 COUNT(DISTINCT a.rs_calendar_id) AS num,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 != "" {
@@ -377,15 +372,16 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
 		pars = append(pars, startDate)
 	}
 	if endDate != "" {
-		sql1 += ` AND b.start_date <= ? `
+		sql1 += ` AND b.end_date <= ? `
 		pars = append(pars, endDate)
 	}
 	if lenCompanyStatusList > 0 {
 		sql1 += ` AND d.overseas_status in (` + utils.GetOrmInReplace(lenCompanyStatusList) + ") "
 		pars = append(pars, companyStatusList)
 	}
+	sql1 += ` GROUP BY admin_id `
 
-	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 COUNT(DISTINCT aa.rs_calendar_id) AS num,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)
@@ -395,20 +391,21 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
 		pars = append(pars, startDate)
 	}
 	if endDate != "" {
-		sql2 += ` AND bb.start_date <= ?  `
+		sql2 += ` AND bb.end_date <= ?  `
 		pars = append(pars, endDate)
 	}
 	if lenCompanyStatusList > 0 {
 		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.*,SUM(m.num) AS num  FROM (` + sql1 + ` UNION ALL ` + sql2
 	sql += ` ) AS m  WHERE 1=1 `
 
 
-	//sql += ` Group by rs_calendar_id `
+	sql += ` Group by admin_id `
 	_, err = o.Raw(sql, pars).QueryRows(&list)
 
 	return