xingzai 5 ماه پیش
والد
کامیت
ea7119a56f
2فایلهای تغییر یافته به همراه27 افزوده شده و 5 حذف شده
  1. 1 1
      controllers/roadshow/calendar_meeting_user.go
  2. 26 4
      models/roadshow/rs_calendar_meeting_user.go

+ 1 - 1
controllers/roadshow/calendar_meeting_user.go

@@ -110,7 +110,7 @@ func (this *CalendarMeetingUserController) Add() {
 			item.ModifyTime = time.Now()
 			items = append(items, item)
 		}
-		err = roadshow.MultiAddRsCalendarMeetingUser(items)
+		err = roadshow.MultiAddRsCalendarMeetingUser(items, roadShowTheme, rsCalendarId)
 		if err != nil {
 			br.Msg = "操作失败!"
 			br.ErrMsg = "操作失败-MultiAddRsCalendarMeetingUser!Err:" + err.Error()

+ 26 - 4
models/roadshow/rs_calendar_meeting_user.go

@@ -55,12 +55,32 @@ type RsCalendarMeetingUserListResp struct {
 }
 
 // MultiAddRsCalendarMeetingUser 批量添加RsCalendarMeetingUser
-func MultiAddRsCalendarMeetingUser(items []*RsCalendarMeetingUser) (err error) {
-	if len(items) == 0 {
+func MultiAddRsCalendarMeetingUser(items []*RsCalendarMeetingUser, roadShowTheme string, rsCalendarId int) (err error) {
+	to, err := orm.NewOrm().Begin()
+	if err != nil {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	sql := ` UPDATE rs_calendar_meeting_user SET road_show_theme=? WHERE rs_calendar_id=? `
+	_, err = to.Raw(sql, roadShowTheme, rsCalendarId).Exec()
+	if err != nil {
+		return
+	}
+
+	if len(items) > 0 {
+		_, err = to.InsertMulti(len(items), items)
+		if err != nil {
+			return
+		}
+	}
+
 	return
 }
 
@@ -170,6 +190,7 @@ func GetRsCalendarMeetingUserByRai(condition string, startSize, pageSize int) (t
 			r.company_name,
 			r.real_name,
 			r.mobile,
+			r.road_show_theme,
 			b.start_date,
 			b.end_date,
 			b.start_time,
@@ -209,6 +230,7 @@ func GetRsCalendarMeetingUserByRaiWeekly(condition string, startSize, pageSize i
 			r.company_name,
 			r.real_name,
 			r.mobile,
+			r.road_show_theme,
 			b.start_date,
 			b.end_date,
 			b.start_time,