新增路演问答标识

models/roadshow/calendar.go

@@ -305,6 +305,10 @@ type CalendarListView struct {
 	SubmitButton           bool   `description:"提交按钮是否展示"`
 	ViewButton             bool   `description:"查看按钮是否展示"`
 	EditButton             bool   `description:"修改按钮是否展示"`
+	CompanyIndustry        string `description:"客户行业"`
+	CompanyClassify        string `description:"客户分类"`
+	QuestionStatus         int    `description:"问答状态：0-未填写；1-已填写"`
+	QuestionMsgStatus      int    `description:"问答模板消息：0-未发送；1-已发送"`
 }
 
 type CalendarListResp struct {
@@ -344,7 +348,8 @@ func GetCalendarList(condition string, pars []interface{}, startSize, pageSize,
 				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,
                 b.delete_reason,a.sys_user_real_name,a.city,a.province,a.company_name,a.company_id,
-                a.cooperation_name,a.theme,a.activity_category,a.english_company
+                a.cooperation_name,a.theme,a.activity_category,a.english_company,
+                b.company_industry,b.company_classify,b.question_status,b.question_msg_status
 				FROM  rs_calendar AS a
 				INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id=b.rs_calendar_id
 				WHERE 1=1
@@ -366,7 +371,8 @@ func GetCalendarList(condition string, pars []interface{}, startSize, pageSize,
 				b.modify_time,b.researcher_id,b.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,
-                b.delete_reason,a.sys_user_real_name,a.city,a.province,a.company_name,a.company_id,a.cooperation_name,a.theme,a.activity_category,a.english_company
+                b.delete_reason,a.sys_user_real_name,a.city,a.province,a.company_name,a.company_id,a.cooperation_name,a.theme,a.activity_category,a.english_company,
+                b.company_industry,b.company_classify,b.question_status,b.question_msg_status
         FROM  rs_calendar AS a
 		INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id=b.rs_calendar_id
 		WHERE 1=1 `

models/roadshow/calendar_researcher_question.go

@@ -10,7 +10,7 @@ type RsCalendarResearcherQuestion struct {
 	RsCalendarResearcherQuestionId int       `orm:"column(rs_calendar_researcher_question_id);pk"`
 	RsCalendarResearcherId         int       `description:"路演研究员记录ID"`
 	QuestionContent                string    `description:"提问内容"`
-	ReplyContent                   string    `description:"客户分类"`
+	ReplyContent                   string    `description:"回复内容"`
 	CreateTime                     time.Time `description:"创建时间"`
 	ModifyTime                     time.Time `description:"更新时间"`
 }
@@ -25,7 +25,7 @@ type RoadShowQuestionSaveReq struct {
 
 type RsCalendarResearcherQuestionSaveReq struct {
 	QuestionContent string `description:"提问内容"`
-	ReplyContent    string `description:"客户分类"`
+	ReplyContent    string `description:"回复内容"`
 }
 
 func RoadShowQuestionSave(req *RoadShowQuestionSaveReq) (err error) {