解决外呼号与手机号，不一致的时候，到会详情展示bug处理

models/activity_attendance_detail.go

@@ -189,7 +189,7 @@ func GetActivityAttendanceDetailList(activityIds string) (items []*CygxActivityA
 //我的日程列表
 func GetActivityAttendanceDetailListAll() (items []*CygxActivityAttendanceDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_activity_attendance_detail WHERE  activity_id <= 100 ORDER BY activity_id  ASC  `
+	sql := `SELECT * FROM cygx_activity_attendance_detail WHERE  activity_id >= 1000 ORDER BY activity_id  ASC  `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

models/activity_signup_detail.go

@@ -43,15 +43,15 @@ func GetActivitySattusToComplete() (items []*CygxActivity, err error) {
 		}
 	}()
 	o := orm.NewOrm()
-	resultTime_30 := time.Now().Add(-time.Minute * 30).Format(utils.FormatDateTime)
-	resultTime_60 := time.Now().Add(-time.Minute * 60).Format(utils.FormatDateTime)
+	//resultTime_30 := time.Now().Add(-time.Minute * 30).Format(utils.FormatDateTime)
+	//resultTime_60 := time.Now().Add(-time.Minute * 60).Format(utils.FormatDateTime)
 	startTime := time.Now().Format(utils.FormatDate)
 	var condition string
-	condition += ` AND (activity_type_id IN ( 1, 2, 3, 7 ) AND  activity_time < '` + resultTime_30 + `'  AND  activity_time > '` + startTime + `')`
+	condition += `  AND  activity_time > '` + startTime + `'`
 	//condition += ` AND (activity_type_id IN ( 1, 2, 3, 7 ) AND  activity_time < '` + resultTime_30 + `')`
-	condition += ` OR(activity_type_id IN ( 4, 5, 6 ) AND  activity_time < '` + resultTime_60 + `')`
+	//condition += ` OR(activity_type_id IN ( 4, 5, 6 ) AND  activity_time < '` + resultTime_60 + `')`
 	//condition += ` OR(activity_type_id IN ( 4, 5, 6 ) AND  activity_time < '` + resultTime_60 + `'  AND  activity_time > '` + startTime + `')`
-	sql := " SELECT * FROM cygx_activity   WHERE 1 = 1 " + condition
+	sql := " SELECT * FROM cygx_activity   WHERE 1 = 1  AND active_state = 3 " + condition
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -142,8 +142,37 @@ func UpdateActivitySignupDetailMulti(items []*CygxActivitySignupDetail) (err err
 	return
 }
 
+type CygxActivitySignupDetailCopy struct {
+	Id                    int       `orm:"column(id);pk"`
+	ActivityId            int       `description:"活动ID"`
+	UserId                int       `description:"用户ID"`
+	CreateTime            time.Time `description:"创建时间"`
+	Mobile                string    `description:"手机号"`
+	Email                 string    `description:"邮箱"`
+	CompanyId             int       `description:"公司id"`
+	CompanyName           string    `description:"公司名称"`
+	FailType              int       `description:"失败原因，0，未失败，1总人数已满，2单机构超限制，3，爽约次数超限"`
+	SignupType            int       `description:"报名方式，1预约外呼，2自主拨入，3我要报名"`
+	DoFailType            int       `description:"失败原因，0，未失败，1总人数已满，2单机构超限制，3，爽约次数超限"`
+	OutboundMobile        string    `description:"外呼手机号"`
+	CountryCode           string    `description:"手机国家区号"`
+	RealName              string    `description:"用户实际名称"`
+	SellerName            string    `description:"所属销售"`
+	FirstMeetingTime      string    `description:"首次入会时间"`
+	LastMeetingTime       string    `description:"最后退出时间"`
+	Duration              string    `description:"参会时长"`
+	MeetingTypeStr        string    `description:"参会方式"`
+	MeetingAuthentication string    `description:"参会权鉴"`
+	MeetingStatusStr      string    `description:"参会状态"`
+	Position              string    `description:"职位"`
+	IsMeeting             int       `description:"是否到会，1到会，0未到会"`
+	UseridEntity          int       `description:"参会者身份. 1:主讲人, 2:主持人, 3:嘉宾, 4:普通参会者, 5:联席主讲人, 6:会议助理"`
+	ActivityTime          string    `description:"活动时间"`
+	CrmCompanyMapStatusId int       `description:"转换后的对应状态信息：1=正式客户, 2=曾使用客户, 3=其他"`
+}
+
 //添加
-func AddCygxActivitySignupDetailCopy(items []*CygxActivitySignupDetail) (err error) {
+func AddCygxActivitySignupDetailCopy(items []*CygxActivitySignupDetailCopy) (err error) {
 	o, err := orm.NewOrm().Begin()
 	if err != nil {
 		return
@@ -166,9 +195,9 @@ func AddCygxActivitySignupDetailCopy(items []*CygxActivitySignupDetail) (err err
 }
 
 // UpdateActivitySignupDetailMulti 批量修改用户报名信息且报名的人
-func UpdateActivitySignupDetailMultiCopy(items []*CygxActivitySignupDetail) (err error) {
+func UpdateActivitySignupDetailMultiCopy(items []*CygxActivitySignupDetailCopy) (err error) {
 	o := orm.NewOrm()
-	p, err := o.Raw(` UPDATE cygx_activity_signup_detail SET 
+	p, err := o.Raw(` UPDATE cygx_activity_signup_detail_copy SET 
 							first_meeting_time = ?,
 							last_meeting_time = ?,
 							duration = ?,
@@ -207,3 +236,13 @@ func UpdateActivitySignupDetailMultiCopy(items []*CygxActivitySignupDetail) (err
 	}
 	return
 }
+
+// 获取参会记录表列表
+func GetSignupDetailListCopy(condition string, pars []interface{}) (list []*CygxActivitySignupDetail, err error) {
+	sql := `SELECT * FROM cygx_activity_signup_detail_copy  WHERE  1= 1 `
+	if condition != "" {
+		sql += condition
+	}
+	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&list)
+	return
+}

models/db.go

@@ -121,6 +121,7 @@ func init() {
 		new(CygxIndustrialArticleGroupManagement),
 		new(ArticleTopHistoryRecord),
 		new(CygxActivitySignupDetail),
+		new(CygxActivitySignupDetailCopy),
 	)
 	// 记录ORM查询日志
 	orm.Debug = true

services/activity_signup_detail.go

@@ -95,7 +95,6 @@ func AddctivitySignupDetail(cont context.Context) (err error) {
 
 //AddctivitySignupDetailByJmcj 通过进门财经添加用户参数信息
 func AddctivitySignupDetailByJmcj(itemsDetail []*models.CygxActivityAttendanceDetail, activityId int) (err error) {
-	fmt.Println()
 	defer func() {
 		if err != nil {
 			fmt.Println(err)
@@ -167,15 +166,14 @@ func AddctivitySignupDetailByJmcj(itemsDetail []*models.CygxActivityAttendanceDe
 		item.UseridEntity = v.UseridEntity
 		item.ActivityTime = v.ActivityTime
 		item.CrmCompanyMapStatusId = v.CrmCompanyMapStatusId
-		//fmt.Println(item)
-		//return err
-		if _, ok := mapsignUpDetai[fmt.Sprint("ActivityId", v.ActivityId, "Mobile", v.Mobile)]; !ok {
+
+		if _, ok := mapsignUpDetai[fmt.Sprint("ActivityId", v.ActivityId, "Mobile", item.Mobile)]; !ok {
 			itemsAdd = append(itemsAdd, item)
 		} else {
 			itemsUpdate = append(itemsUpdate, item)
 		}
 	}
-
+	//return err
 	if len(itemsAdd) > 0 {
 		err = models.AddCygxActivitySignupDetail(itemsAdd)
 		if err != nil {
@@ -183,7 +181,7 @@ func AddctivitySignupDetailByJmcj(itemsDetail []*models.CygxActivityAttendanceDe
 		}
 	}
 
-	if len(itemsAdd) > 0 {
+	if len(itemsUpdate) > 0 {
 		err = models.UpdateActivitySignupDetailMulti(itemsUpdate)
 		if err != nil {
 			return
@@ -192,9 +190,6 @@ func AddctivitySignupDetailByJmcj(itemsDetail []*models.CygxActivityAttendanceDe
 
 	return err
 }
-func init() {
-	GetCygxActivityAttendanceDetail()
-}
 
 func GetCygxActivityAttendanceDetail() {
 	listAll, err := models.GetActivityAttendanceDetailListAll()