Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_12.2

controllers/activity.go

@@ -413,12 +413,12 @@ func (this *ActivityCoAntroller) Detail() {
 			}
 
 			// 查研观向7.4-行业新标签
-			industryNewMap, e := services.GetIndustryNewLabelMap(industryIds)
-			if e != nil {
-				br.Msg = "获取信息失败"
-				br.ErrMsg = "获取产业新标签失败, Err: " + e.Error()
-				return
-			}
+			//industryNewMap, e := services.GetIndustryNewLabelMap(industryIds)
+			//if e != nil {
+			//	br.Msg = "获取信息失败"
+			//	br.ErrMsg = "获取产业新标签失败, Err: " + e.Error()
+			//	return
+			//}
 
 			//判断产业下是否有关联的报告，并处理是否跳转
 			industrialManagementId = strings.TrimRight(industrialManagementId, ",")
@@ -442,7 +442,7 @@ func (this *ActivityCoAntroller) Detail() {
 					if mapIndustrial[v.IndustrialManagementId] > 0 && !industrialList[k].IsResearch {
 						industrialList[k].IsJump = true
 					}
-					industrialList[k].IndustryNewLabel = industryNewMap[v.IndustrialManagementId]
+					//industrialList[k].IndustryNewLabel = industryNewMap[v.IndustrialManagementId]
 				}
 			}
 		}

models/activity_signup_detail.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_cygx/utils"
 	"time"
@@ -176,3 +177,27 @@ func UpdateActivitySignupDetailMultiByYiDong(items []*CygxActivitySignupDetail)
 	}
 	return
 }
+
+// UpdateActivitySignupDetailMultiByYiDong 易董批量修改用户报名信息且报名的人
+func UpdateActivitySignupDetailMultiMobileAndUserId(items []*CygxActivitySignupDetail) (err error) {
+	o := orm.NewOrm()
+	p, err := o.Raw(` UPDATE cygx_activity_signup_detail SET
+							user_id = ?
+							WHERE mobile = ? AND user_id = 0 `).Prepare()
+	if err != nil {
+		return
+	}
+	defer func() {
+		_ = p.Close() // 别忘记关闭 statement
+	}()
+	for _, v := range items {
+		fmt.Println(v.Mobile)
+		_, err = p.Exec(
+			v.UserId,
+			v.Mobile)
+		if err != nil {
+			return
+		}
+	}
+	return
+}

services/activity_signup_detail.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
@@ -253,6 +254,28 @@ func AddctivitySignupDetailByJmcjNew(itemsDetail []*models.CygxActivityAttendanc
 	var itemsAdd []*models.CygxActivitySignupDetail
 	var itemsUpdate []*models.CygxActivitySignupDetail
 
+	var mobiles []string
+	mobileMap := make(map[string]bool)
+	mobileUserMap := make(map[string]int)
+	for _, v := range itemsDetail {
+		if !mobileMap[v.Mobile] {
+			mobiles = append(mobiles, v.Mobile)
+		}
+		mobileMap[v.Mobile] = true
+	}
+	//mobiles = make([]string, 0)
+	//mobiles = append(mobiles, "13054631616")
+	//根据手机号获取这些用户的信息
+	listUser, e := models.GetWxUserByOutboundMobiles(mobiles)
+	if e != nil {
+		err = errors.New("GetWxUserOutboundMobiles, Err: " + e.Error())
+		return
+	}
+
+	for _, v := range listUser {
+		mobileUserMap[v.Mobile] = v.UserId
+	}
+
 	for _, v := range itemsDetail {
 		var item = new(models.CygxActivitySignupDetail)
 		item.ActivityId = v.ActivityId
@@ -279,6 +302,7 @@ func AddctivitySignupDetailByJmcjNew(itemsDetail []*models.CygxActivityAttendanc
 		item.UseridEntity = v.UseridEntity
 		item.ActivityTime = v.ActivityTime
 		item.CrmCompanyMapStatusId = v.CrmCompanyMapStatusId
+		item.UserId = mobileUserMap[v.Mobile]
 
 		if _, ok := mapsignUpDetai[fmt.Sprint("ActivityId", v.ActivityId, "Mobile", item.Mobile)]; !ok {
 			itemsAdd = append(itemsAdd, item)
@@ -308,3 +332,46 @@ func AddctivitySignupDetailByJmcjNew(itemsDetail []*models.CygxActivityAttendanc
 	}
 	return err
 }
+
+//func init() {
+//	var err error
+//	defer func() {
+//		if err != nil {
+//			fmt.Println(err)
+//		}
+//	}()
+//	var condition string
+//	var pars []interface{}
+//	condition = " AND  user_id = 0 AND company_id > 1 AND mobile != '' "
+//	signUpDetailList, e := models.GetSignupDetailList(condition, pars)
+//	if e != nil && e.Error() != utils.ErrNoRow() {
+//		err = errors.New("GetSignupDetailList, Err: " + e.Error())
+//		return
+//	}
+//	var mobiles []string
+//	mobileMap := make(map[string]bool)
+//	for _, v := range signUpDetailList {
+//		if !mobileMap[v.Mobile] {
+//			mobiles = append(mobiles, v.Mobile)
+//		}
+//		mobileMap[v.Mobile] = true
+//	}
+//	//mobiles = make([]string, 0)
+//	//mobiles = append(mobiles, "13054631616")
+//	//根据手机号获取这些用户的信息
+//	listUser, e := models.GetWxUserByOutboundMobiles(mobiles)
+//	if e != nil {
+//		err = errors.New("GetWxUserOutboundMobiles, Err: " + e.Error())
+//		return
+//	}
+//
+//	var itemsUpdate []*models.CygxActivitySignupDetail
+//	for _, v := range listUser {
+//		item := new(models.CygxActivitySignupDetail)
+//		item.UserId = v.UserId
+//		item.Mobile = v.Mobile
+//		itemsUpdate = append(itemsUpdate, item)
+//	}
+//	fmt.Println(len(itemsUpdate))
+//	err = models.UpdateActivitySignupDetailMultiMobileAndUserId(itemsUpdate)
+//}