Browse Source

Merge branch 'crm/crm_16.6' of http://8.136.199.33:3000/hongze/hz_crm_api into crm/crm_16.6

zhangchuanxing 6 days ago
parent
commit
cef39e65f6
1 changed files with 9 additions and 0 deletions
  1. 9 0
      controllers/roadshow/report.go

+ 9 - 0
controllers/roadshow/report.go

@@ -694,6 +694,7 @@ func (this *CalendarController) SellerReportList() {
 // @Param   StartDate   query   string  true       "开始日期,格式:2022-04-06"
 // @Param   EndDate   query   string  true       "结束日期,格式:2022-04-06"
 // @Param   Status   query   int  true       "0:全部,1:已完成"
+// @Param   EnglishCompany   query   int  true       "-1:全部,0:国内,1:海外"
 // @Success 200 {object} []roadshow.RsReportRecordList
 // @router /report/calendar/list [get]
 func (this *CalendarController) ReportCalendarList() {
@@ -721,6 +722,8 @@ func (this *CalendarController) ReportCalendarList() {
 
 	status, _ := this.GetInt("Status")
 
+	englishCompany, _ := this.GetInt("EnglishCompany")
+
 	//正式客户
 	var condition string
 	var pars []interface{}
@@ -777,6 +780,12 @@ func (this *CalendarController) ReportCalendarList() {
 		condition += ` and c.question_status = ? `
 		pars = append(pars, 1)
 	}
+
+	if englishCompany > 0 {
+		condition += ` and b.english_company = ? `
+		pars = append(pars, englishCompany)
+	}
+
 	list, err := roadshow.GetRsReportRecordList(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"