Merge branch 'cygx/cygx_14-5' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

models/roadshow/report_record.go

@@ -104,6 +104,26 @@ func GetGroupResearcherRecordList(condition string, pars []interface{}) (list []
 	return
 }
 
+// GetGroupResearcherRecordListAsk 获取研究员分组数据()
+func GetGroupResearcherRecordListAsk(condition string, pars []interface{}) (list []*RsReportRecordGroup, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT 
+				a.researcher_id AS admin_id,
+				a.researcher_group_id AS group_id,
+				a.researcher_name admin_name,
+				count( 1 ) num  
+				FROM  rs_report_record a 
+				inner join rs_calendar_researcher AS c ON a.rs_calendar_id=c.rs_calendar_id AND a.rs_calendar_researcher_id=c.rs_calendar_researcher_id
+				WHERE 1=1 and a.rs_calendar_researcher_status = 2 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` GROUP BY 	a.researcher_id `
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+
+	return
+}
+
 // GetGroupSellerRecordList 获取销售分组数据
 func GetGroupSellerRecordList(condition string, pars []interface{}) (list []*RsReportRecordGroup, err error) {
 	o := orm.NewOrm()

services/roadshow/report.go

@@ -277,8 +277,11 @@ func getResearcherSectionData(startDate, endDate time.Time) (adminDataMap AdminD
 			formalMap[v.AdminId] = v.Num
 		}
 
-		condition += ` and  question_status = 1  `
-		dataAsk, tmpErr := roadshow.GetGroupResearcherRecordList(condition, pars)
+		var conditionAsk string
+		var parsAsk []interface{}
+		conditionAsk = ` and  c.question_status = 1  and a.start_date >= ? and a.end_date <= ?  and a.company_status = ? `
+		parsAsk = append(parsAsk, startDate, endDate, "正式")
+		dataAsk, tmpErr := roadshow.GetGroupResearcherRecordListAsk(conditionAsk, parsAsk)
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -305,8 +308,11 @@ func getResearcherSectionData(startDate, endDate time.Time) (adminDataMap AdminD
 			tryOutMap[v.AdminId] = v.Num
 		}
 
-		condition += ` and  question_status = 1  `
-		dataAsk, tmpErr := roadshow.GetGroupResearcherRecordList(condition, pars)
+		var conditionAsk string
+		var parsAsk []interface{}
+		conditionAsk = ` and  c.question_status = 1  and a.start_date >= ? and a.end_date <= ?  and a.company_status = ? `
+		parsAsk = append(parsAsk, startDate, endDate, "试用")
+		dataAsk, tmpErr := roadshow.GetGroupResearcherRecordListAsk(conditionAsk, parsAsk)
 		if tmpErr != nil {
 			err = tmpErr
 			return