no message

controllers/cygx/report_article.go

@@ -2859,13 +2859,11 @@ func initOrderArticle() {
 }
 
 func initRsList() {
-
 	list, errList := roadshow.GetCalendarDetailListinit()
 	if errList != nil {
 		fmt.Println(errList)
 		return
 	}
-
 	//创建excel
 	dir, err := os.Executable()
 	exPath := filepath.Dir(dir)
@@ -2920,7 +2918,7 @@ func initRsList() {
 		cellBData := row.AddCell()
 		cellBData.Value = item.StartDate + " " + item.StartTime
 		cellCData := row.AddCell()
-		cellCData.Value = item.Title
+		cellCData.Value = item.CompanyName
 
 		cellCnameData := row.AddCell()
 		cellCnameData.Value = item.SysUserRealName

models/roadshow/calendar.go

@@ -528,20 +528,22 @@ func GetCalendarDetailListinit() (list []*CalendarListView, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 
-b.researcher_name , b.start_date  , b.start_time ,a.title,sys_user_real_name
+a.rs_calendar_id,
+b.researcher_name , b.start_date  , b.start_time,a.company_name ,sys_user_real_name
 
 FROM
 	rs_calendar AS a
 	INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id = b.rs_calendar_id
 WHERE
 	1 = 1
-	AND a.sys_user_id IN (SELECT  admin_id FROM  admin WHERE role_type_code IN  ('rai_group','rai_seller','rai_admin'))
+	AND a.sys_user_id IN (SELECT  admin_id FROM  admin WHERE role_type_code IN  ('rai_group','rai_seller')   	and role_id != 28   AND enabled = 1 )
 	AND a.rs_calendar_id NOT  IN (SELECT  rs_calendar_id FROM  rs_calendar_meeting_user GROUP BY rs_calendar_id )
 	AND a.activity_type = '路演'
 	AND b.start_date >= '2024-07-01'
-	AND b.end_date <='2024-09-11'
-	
-	ORDER BY start_date ASC  ,start_time ASC  `
+	AND b.end_date <='2024-09-10'
+	AND a.company_name !=''
+	AND b.status IN  (2,6)                                                                                 
+	ORDER BY start_date ASC  ,start_time ASC    `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }