no message

controllers/cygx/activity_meet.go

@@ -512,6 +512,8 @@ func (this *ActivityMeetCoAntroller) OfflineMeetingList() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
+	var mobileArr []string
 	resp := new(cygx.CygxActivitySignupListRep)
 	if len(list) == 0 {
 		list = make([]*cygx.CygxActivitySignupList, 0)
@@ -526,6 +528,25 @@ func (this *ActivityMeetCoAntroller) OfflineMeetingList() {
 			if list[k].Channel == 0 && list[k].IsMeeting == 1 {
 				list[k].IsAirborne = 1
 			}
+			mobileArr = append(mobileArr, v.Mobile)
+		}
+	}
+	mapMobileUser := make(map[string]string)
+
+	if len(mobileArr) > 0 {
+
+		listUser, err := models.GetWxUserListByUserMobileHaveCompany(mobileArr)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败，GetWxUserListByUserMobileHaveCompany Err:" + err.Error()
+			return
+		}
+		for _, v := range listUser {
+			mapMobileUser[v.Mobile] = v.RealName
+		}
+
+		for _, v := range list {
+			v.RealName = mapMobileUser[v.Mobile]
 		}
 	}
 
@@ -1405,13 +1426,13 @@ func (this *ActivityMeetCoAntroller) AttendanceDetail() {
 		mobileStr = "1"
 	}
 	condition2 += ` AND d.mobile NOT IN ( ` + mobileStr + ` )  `
-	list2, err := cygx.GetAttendanceDetailList2(activityId, condition2+` AND u.company_id != 1 `)
+	list2, err := cygx.GetAttendanceDetailList2(activityId, condition2+` AND d.company_id > 1 `)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	listNoAppointment, err := cygx.GetAttendanceDetailList2(activityId, ` AND d.mobile NOT IN ( `+mobileStr+` )  `+` AND u.company_id != 1 `) //未预约 所有
+	listNoAppointment, err := cygx.GetAttendanceDetailList2(activityId, ` AND d.mobile NOT IN ( `+mobileStr+` )  `+` AND d.company_id > 1  `) //未预约 所有
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()

models/cygx/activity_attendance_detail.go

@@ -119,7 +119,6 @@ func GetAttendanceDetailList(activityId int, sqlStr string) (item []*AttendanceD
 			AND s.fail_type = 0 
 			AND s.is_cancel = 0
 			AND d.userid_entity != 3
-			AND u.mobile != ''
 			AND s.activity_id = ?` + sqlStr + `  GROUP BY s.id  ORDER BY s.is_meeting DESC`
 	_, err = o.Raw(sql, activityId).QueryRows(&item)
 	return
@@ -159,7 +158,7 @@ func GetAttendanceDetailList2(activityId int, sqlStr string) (item []*Attendance
 	sql := `SELECT d.activity_id,d.real_name,d.company_id,d.first_meeting_time,d.last_meeting_time,d.meeting_type_str,d.meeting_authentication,d.meeting_status_str,d.mobile,d.duration,d.company_name,d.position,d.userid_entity
 			FROM
 			cygx_activity_attendance_detail AS d
-			WHERE 1 = 1 AND d.activity_id = ? AND is_meeting_str = 1 AND d.userid_entity != 3 AND u.mobile != '' ` + sqlStr + ` GROUP BY d.mobile`
+			WHERE 1 = 1 AND d.activity_id = ? AND is_meeting_str = 1 AND d.userid_entity != 3  ` + sqlStr + ` GROUP BY d.mobile`
 	_, err = o.Raw(sql, activityId).QueryRows(&item)
 	return
 }

models/cygx/cygx_user_record.go

@@ -325,6 +325,7 @@ func GetCygxUserRecordCompany() (items []*OpenIdList, err error) {
 func GetCygxUserRecordCompanyUserId() (items []*OpenIdList, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
+			u.open_id,
 			u.cygx_user_id AS user_id 
 		FROM
 			cygx_user_record AS u 
@@ -391,7 +392,7 @@ func GetUserRecordListByMobileArr(bindAccount []string) (items []*OpenIdList, er
 func GetUserRecordOpenidByMobile(bindAccount string) (item *OpenIdList, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	var sql string
-	sql = `SELECT cr.open_id,u.cygx_user_id as  user_id
+	sql = `SELECT cr.open_id,cr.cygx_user_id as  user_id
 			FROM cygx_user_record AS cr 
 			WHERE cr.cygx_bind_account = ?`
 	err = o.Raw(sql, bindAccount).QueryRow(&item)
@@ -401,7 +402,7 @@ func GetUserRecordOpenidByMobile(bindAccount string) (item *OpenIdList, err erro
 // 获取预约活动的用户的openID
 func GetActivityOpenIdList(activityId int) (items []*OpenIdList, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := `SELECT DISTINCT cr.open_id,u.cygx_user_id as  user_id
+	sql := `SELECT DISTINCT cr.open_id,cr.cygx_user_id as  user_id
 			FROM
 			cygx_my_schedule AS m
 			INNER JOIN cygx_user_record AS cr ON cr.cygx_bind_account = m.mobile 
@@ -413,7 +414,7 @@ func GetActivityOpenIdList(activityId int) (items []*OpenIdList, err error) {
 // 获取预约活动的用户的openID
 func GetActivitySpecialOpenIdList() (items []*OpenIdList, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := `SELECT DISTINCT cr.open_id,u.cygx_user_id as  user_id
+	sql := `SELECT DISTINCT cr.open_id,cr.cygx_user_id as  user_id
 			FROM
 			cygx_user_follow_special AS m
 			INNER JOIN cygx_user_record AS cr ON cr.cygx_bind_account = m.mobile  `
@@ -424,7 +425,7 @@ func GetActivitySpecialOpenIdList() (items []*OpenIdList, err error) {
 // 获取关注作者的用户的openID
 func GetFollowDepartmentOpenIdList(departmentId int) (items []*OpenIdList, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := `SELECT  DISTINCT cr.open_id,u.cygx_user_id as  user_id
+	sql := `SELECT  DISTINCT cr.open_id,cr.cygx_user_id as  user_id
 			FROM
 				cygx_article_department_follow AS f
 				INNER JOIN cygx_user_record AS cr  ON cr.cygx_bind_account = f.mobile   
@@ -437,7 +438,7 @@ func GetFollowDepartmentOpenIdList(departmentId int) (items []*OpenIdList, err e
 // 获取关注产业的用户的openID
 func GetFollowindustrialOpenIdList(industrialManagementId int) (items []*OpenIdList, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := `SELECT DISTINCT cr.open_id,u.cygx_user_id as  user_id
+	sql := `SELECT DISTINCT cr.open_id,cr.cygx_user_id as  user_id
 			FROM
 			cygx_industry_fllow AS f
 			INNER JOIN cygx_user_record AS cr  ON cr.cygx_bind_account = f.mobile   

models/wx_user.go

@@ -32,14 +32,11 @@ type WxUser struct {
 	OpenId              string    `orm:"column(open_id)" description:"微信openid"`
 	Headimgurl          string    `description:"用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像），用户没有头像时该项为空"`
 	UserLabel           string    `description:"查研观向用户标签"`
-<<<<<<< HEAD
 	MarkGroup           string    `description:"标记分组"`
-=======
 	FiccViewTotal       int       `description:"ficc报告的阅读次数"`
 	FiccLastViewTime    string    `description:"ficc报告最近一次阅读时间"`
 	RaiViewTotal        int       `description:"权益报告的阅读次数"`
 	RaiLastViewTime     string    `description:"权益报告的最近一次阅读时间"`
->>>>>>> 780002e4271ebf9609c9ac29504391688ac7290f
 }
 
 func AddWxUser(item *WxUser) (lastId int64, err error) {
@@ -531,7 +528,6 @@ func GetWxUserListCompanyId(companyId int) (list []*WxUserItem, err error) {
 	return
 }
 
-<<<<<<< HEAD
 type WxUserSller struct {
 	UserId      int    `description:"用户id"`
 	RealName    string `description:"姓名"`
@@ -577,7 +573,7 @@ func GetWxUserByCompanyIds(companyIds []int) (items []*WxUser, err error) {
 	return
 }
 
-//GetWxUserList 用户列表查询
+// GetWxUserList 用户列表查询
 func GetWxUserList(condition string, pars []interface{}) (items []*WxUser, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT *