Merge branch 'crm/crm_16.6' into debug

controllers/roadshow/report.go

@@ -662,6 +662,7 @@ func (this *CalendarController) SellerReportList() {
 // @Param   AdminId   query   int  true       "用户id"
 // @Param   StartDate   query   string  true       "开始日期,格式：2022-04-06"
 // @Param   EndDate   query   string  true       "结束日期,格式：2022-04-06"
+// @Param   Status   query   int  true       "0:全部,1:已完成"
 // @Success 200 {object} []roadshow.RsReportRecordList
 // @router /report/calendar/list [get]
 func (this *CalendarController) ReportCalendarList() {
@@ -687,6 +688,8 @@ func (this *CalendarController) ReportCalendarList() {
 		return
 	}
 
+	status, _ := this.GetInt("Status")
+
 	//正式客户
 	var condition string
 	var pars []interface{}
@@ -739,6 +742,10 @@ func (this *CalendarController) ReportCalendarList() {
 		return
 	}
 
+	if status == 1 {
+		condition += ` and c.question_status = ? `
+		pars = append(pars, 1)
+	}
 	list, err := roadshow.GetRsReportRecordList(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"

models/roadshow/report_record.go

@@ -145,14 +145,19 @@ type RsReportRecordList struct {
 	Province                   string    `description:"省"`
 	City                       string    `description:"市"`
 	CooperationName            string    `description:"合作方名称"`
+	CompanyIndustry            string    `description:"客户行业"`
+	CompanyClassify            string    `description:"客户分类"`
+	QuestionStatus             int       `description:"问答状态：0-未填写；1-已填写"`
+	QuestionMsgStatus          int       `description:"问答模板消息：0-未发送；1-已发送"`
 }
 
 // GetRsReportRecordList 获取路演统计详情返回数据
 func GetRsReportRecordList(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
+	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
 				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
 				WHERE 1=1 and a.rs_calendar_researcher_status = 2 
  `
 	if condition != "" {