zhangchuanxing 3 месяцев назад
Родитель
Сommit
a37a4db130
1 измененных файлов с 24 добавлено и 21 удалено
  1. 24 21
      services/yidong.go

+ 24 - 21
services/yidong.go

@@ -662,7 +662,7 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 				if vresult.PersonTelephone == "" {
 					continue
 				}
-				if vresult.Duration != "" || vresult.DurationReview != "" {
+				if vresult.Duration != "" || vresult.DurationReview != "" || vresult.DurationLive != "" {
 					mobiles = append(mobiles, vresult.PersonTelephone)
 					//err = models.UpdateCygxActivitySignupisMeet(v.ActivityId, vresult.PersonTelephone)
 					//if err != nil {
@@ -670,7 +670,10 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 					//	return err
 					//}
 					var itemDetail = new(models.CygxActivitySignupDetail)
-					if vresult.Duration != "" {
+					if vresult.Duration != "" || vresult.DurationLive != "" {
+						if vresult.Duration == "" {
+							vresult.Duration = vresult.DurationLive
+						}
 						itemDetail.FirstMeetingTime = vresult.StartTime
 						itemDetail.LastMeetingTime = vresult.EndTime
 						itemDetail.Duration = vresult.Duration
@@ -693,34 +696,34 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 					mapActivityAttendanceDetail[vresult.PersonTelephone].LastMeetingTime = vresult.EndTime
 					mapActivityAttendanceDetail[vresult.PersonTelephone].Duration = utils.GetAttendanceDetailSecondsByYiDong(vresult.Duration)
 					itemsUpdate = append(itemsUpdate, itemDetail)
+				} else {
+					continue
 				}
 
 				item := new(models.CygxActivityAttendanceDetail)
 				item.ActivityId = v.ActivityId
-				item.Mobile = vresult.PersonTelephone
-				if vresult.Duration != "" {
-					if vresult.Duration != "" {
-						item.FirstMeetingTime = vresult.StartTime
-						item.LastMeetingTime = vresult.EndTime
-						item.Duration = vresult.Duration
-						item.MeetingStatusStr = "直播"
-					} else if vresult.DurationReview != "" {
-						item.FirstMeetingTime = vresult.StartTimeReview
-						item.LastMeetingTime = vresult.EndTimeReview
-						item.Duration = vresult.DurationReview
-						item.MeetingStatusStr = "回放"
-					}
-					item.Position = vresult.JobName
-					item.RealName = vresult.PersonName
 
+				if vresult.Duration != "" {
 					item.FirstMeetingTime = vresult.StartTime
 					item.LastMeetingTime = vresult.EndTime
 					item.Duration = vresult.Duration
-					item.IsMeetingStr = 1
-					mobileStrMeet += "'" + vresult.PersonTelephone + "'" + ","
-					item.CreateTime = time.Now()
-					needAddAttendanc = append(needAddAttendanc, item)
+					item.MeetingStatusStr = "直播"
+				} else if vresult.DurationReview != "" {
+					item.FirstMeetingTime = vresult.StartTimeReview
+					item.LastMeetingTime = vresult.EndTimeReview
+					item.Duration = vresult.DurationReview
+					item.MeetingStatusStr = "回放"
 				}
+				item.Position = vresult.JobName
+				item.RealName = vresult.PersonName
+
+				item.FirstMeetingTime = vresult.StartTime
+				item.LastMeetingTime = vresult.EndTime
+				item.Duration = vresult.Duration
+				item.IsMeetingStr = 1
+				mobileStrMeet += "'" + vresult.PersonTelephone + "'" + ","
+				item.CreateTime = time.Now()
+				needAddAttendanc = append(needAddAttendanc, item)
 				mobileStr += "'" + vresult.PersonTelephone + "'" + ","
 
 			}