Merge branch 'crm/crm_16.6' into debug

controllers/roadshow/report.go

@@ -2097,6 +2097,7 @@ func (this *CalendarController) ResearcherReportExport() {
 	titleRow.AddCell().SetString("客户状态")
 	titleRow.AddCell().SetString("客户行业")
 	titleRow.AddCell().SetString("客户分类")
+	titleRow.AddCell().SetString("所属区域")
 
 	for _, v := range list {
 		dataRow := sheet.AddRow()
@@ -2113,6 +2114,11 @@ func (this *CalendarController) ResearcherReportExport() {
 		dataRow.AddCell().SetString(v.CompanyStatus)
 		dataRow.AddCell().SetString(v.CompanyIndustry)
 		dataRow.AddCell().SetString(v.CompanyClassify)
+		if v.EnglishCompany == 0 {
+			dataRow.AddCell().SetString("国内")
+		} else {
+			dataRow.AddCell().SetString("海外")
+		}
 	}
 
 	if e = xlsxFile.Save(downloadPath); e != nil {

models/roadshow/report_record.go

@@ -494,7 +494,7 @@ func UpdateRsReportRecordInteractionNumnMulti(items []*RsReportRecord) (err erro
 
 func GetReportResearcherExport(condition string, pars []interface{}) (list []*RsReportRecordList, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.theme,b.roadshow_platform,b.province,b.city,b.cooperation_name,c.company_industry,c.company_classify,c.question_status,c.question_msg_status
+	sql := ` SELECT a.*,b.theme,b.roadshow_platform,b.province,b.city,b.cooperation_name,c.company_industry,c.company_classify,c.question_status,c.question_msg_status,b.english_company
 				FROM  rs_report_record a 
 				join rs_calendar b on a.rs_calendar_id=b.rs_calendar_id
 				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