Merge branch 'crm/crm_16.6' into debug

controllers/roadshow/company.go

@@ -180,6 +180,11 @@ func (this *CalendarController) CompanyDetail() {
 			detailView.ReportReadTotal = viewTotal
 		}
 
+		if productId == 1 {
+			detailView.CompanyType = "FICC"
+		} else {
+			detailView.CompanyType = "权益"
+		}
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"

controllers/roadshow/report.go

@@ -2045,10 +2045,9 @@ func (this *CalendarController) ResearcherReportExport() {
 	var pars []interface{}
 
 	condition += ` AND c.researcher_id IN(` + strings.Join(researcherIdArr, ",") + `) `
-	pars = append(pars, startDate, endDate)
 
 	if startDate != "" {
-		condition = ` AND c.start_date >= ? `
+		condition += ` AND c.start_date >= ? `
 		pars = append(pars, startDate)
 	}
 

models/roadshow/calendar_researcher_question.go

@@ -157,7 +157,7 @@ func GetQuestionSummaryListCount(condition string, pars []interface{}) (count in
 
 func GetQuestionSummaryList(condition string, pars []interface{}, startSize, pageSize int) (list []*QuestionSummary, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT a.rs_calendar_id,a.activity_type,a.roadshow_type,a.activity_category,a.roadshow_platform,b.create_time,a.district,
+	sql := ` SELECT a.sys_user_id,a.sys_user_real_name,a.rs_calendar_id,a.activity_type,a.roadshow_type,a.activity_category,a.roadshow_platform,b.create_time,a.district,
 				b.modify_time,GROUP_CONCAT(b.researcher_id ORDER BY researcher_sort ASC) AS researcher_id,GROUP_CONCAT(b.researcher_name ORDER BY researcher_sort ASC) AS researcher_name,
 				b.rs_calendar_researcher_id,b.start_date,
 				b.end_date,b.start_time,b.end_time,b.start_week,b.end_week,b.status,b.refuse_reason,b.refuse_time,

models/roadshow/company.go

@@ -105,4 +105,5 @@ type CompanyDetailView struct {
 	EnglishCompany   int    `description:"是否为英文客户: 0-否; 1-是"`
 	EnglishCountry   string `description:"英文客户-国家"`
 	EnglishViewTotal int    `description:"英文客户-累计点击量"`
+	CompanyType      string `description:"客户类型"`
 }