Merge branch 'cygx/mfyx_1.0' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/cygx/activity_signup.go

@@ -2098,12 +2098,34 @@ func (this *ActivitySignupCoAntroller) AskList() {
 		return
 	}
 	list, err := cygx.GetActivityHelpAskList(activityId)
-	respist := new(cygx.ActivityHelpAskListResp)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+	var userIds []string
+	for _, v := range list {
+		userIds = append(userIds, strconv.Itoa(v.UserId))
+	}
+	// 查询留言相关的用户
+	var userOthers []*models.WxUser
+	if len(userIds) > 0 {
+		userOthers, err = models.GetWxUserListByUserIds(strings.Join(userIds, ","))
+		if err != nil {
+			br.Msg = "查询留言用户出错"
+			br.ErrMsg = "查询留言用户出错，Err:" + err.Error()
+			return
+		}
+	}
+	usersMapName := make(map[int]string)
+	for _, v := range userOthers {
+		usersMapName[int(v.UserId)] = v.RealName
+	}
+	for _, v := range list {
+		v.RealName = usersMapName[v.UserId]
+	}
+	respist := new(cygx.ActivityHelpAskListResp)
+
 	respist.List = list
 	br.Ret = 200
 	br.Success = true
@@ -2141,6 +2163,28 @@ func (this *ActivitySignupCoAntroller) AskListExport() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
+	var userIds []string
+	for _, v := range list {
+		userIds = append(userIds, strconv.Itoa(v.UserId))
+	}
+	// 查询留言相关的用户
+	var userOthers []*models.WxUser
+	if len(userIds) > 0 {
+		userOthers, err = models.GetWxUserListByUserIds(strings.Join(userIds, ","))
+		if err != nil {
+			br.Msg = "查询留言用户出错"
+			br.ErrMsg = "查询留言用户出错，Err:" + err.Error()
+			return
+		}
+	}
+	usersMapName := make(map[int]string)
+	for _, v := range userOthers {
+		usersMapName[int(v.UserId)] = v.RealName
+	}
+	for _, v := range list {
+		v.RealName = usersMapName[v.UserId]
+	}
 	//创建excel
 	dir, err := os.Executable()
 	exPath := filepath.Dir(dir)

controllers/cygx/apply_record.go

@@ -179,9 +179,11 @@ func (this *ApplyRecordController) ListSysRole() {
 
 		switch v.RegisterPlatform {
 		case 1:
-			list[i].ApplicationSource = "小程序"
+			list[i].ApplicationSource = "查研小程序"
 		case 2:
 			list[i].ApplicationSource = "网页版"
+		case 5:
+			list[i].ApplicationSource = "研选小程序"
 		}
 
 		switch v.InviteCompanySource {