Merge branch 'CRM_15.6' into debug

controllers/roadshow/report.go

@@ -1609,7 +1609,7 @@ func (this *CalendarController) OverseasResearcherReportList() {
 // @Title 海外客户路演详情列表
 // @Description 海外客户路演详情列表接口
 // @Param   AdminType   query   string  true       "枚举值：researcher、seller、 special：专项路演"
-// @Param   DataType   query   string  true       "枚举值：try_out、formal、meeting、online、offline"
+// @Param   DataType   query   string  true       "枚举值：try_out、formal、close、online、offline"
 // @Param   AdminIds   query   string  true       "用户ids"
 // @Param   StartDate   query   string  true       "开始日期,格式：2022-04-06"
 // @Param   EndDate   query   string  true       "结束日期,格式：2022-04-06"
@@ -1664,7 +1664,7 @@ func (this *CalendarController) OverseasCalendarList() {
 		}
 		condition += ` and a.researcher_id IN (` + detail.ConfigValue + `) `
 	} else {
-		condition += ` and a.researcher_id (` + utils.GetOrmInReplace(len(adminIdsArr)) + `)`
+		condition += ` and a.researcher_id IN (` + utils.GetOrmInReplace(len(adminIdsArr)) + `)`
 	}
 	pars = append(pars, adminIdsArr)
 
@@ -1676,9 +1676,9 @@ func (this *CalendarController) OverseasCalendarList() {
 	case "formal":
 		condition += ` and a.company_status = ? `
 		pars = append(pars, "正式")
-	case "meeting":
-		condition += ` and a.activity_type = ? `
-		pars = append(pars, "公开会议")
+	case "close":
+		condition += ` and a.company_status = ? `
+		pars = append(pars, "关闭")
 	case "online":
 		condition += ` and a.roadshow_type = ? `
 		pars = append(pars, "线上")