no message

controllers/cygx/activity.go

@@ -9,7 +9,6 @@ import (
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/services"
 	cygxService "hongze/hz_crm_api/services/cygx"
-	"hongze/hz_crm_api/services/elastic"
 	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
@@ -105,6 +104,11 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 	videoDetail := req.VideoDetail
 	isBClass := req.IsBClass
 	isResearchPoints := req.IsResearchPoints
+	isShowHz := req.IsShowHz
+	isResearch := req.IsResearch //是否是研选类型的活动
+	if isResearch {
+		req.PermissionName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
+	}
 	var items []*cygx.CygxActivity
 	//temporaryLabel := req.TemporaryLabel
 	industrialManagementIdS := req.IndustrialManagementIdS
@@ -431,6 +435,9 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 			item.LastUpdatedTime = time.Now()
 			item.Scale = scale
 			item.IsExternalLabel = isExternalLabel
+			item.IsShowHz = isShowHz
+			item.ChartPermissionIdDeputy = charInfo.ChartPermissionId
+			item.ChartPermissionNameDeputy = charInfo.PermissionName
 			if len(labelList) == 1 {
 				item.IsCanAppointmentMinutes = labelList[0].IsCanAppointmentMinutes
 			} else {
@@ -670,12 +677,10 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 				//更新活动音频
 				if int(voiceIdNew) > 0 {
 					go cygxService.UpdateResourceData(int(voiceIdNew), "activityvoice", "add", activityInfo.ActivityTime)
-					go elastic.AddComprehensiveActivityVoice(activityId) //更新ES中的活动音频内容
 				}
 				//更新活动视频
 				if int(videoIdNew) > 0 {
 					go cygxService.UpdateResourceData(int(videoIdNew), "activityvideo", "add", activityInfo.ActivityTime)
-					go elastic.AddComprehensiveActivityVideo(activityId) //更新ES中的活动视频内容
 				}
 
 				errAct = err
@@ -704,7 +709,6 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 						go cygxService.DoActivityOnenIdWxTemplateMsg(activityId)
 					}
 				}
-
 				//已结束或者进行中的活动修改时间后，修改活动状态以及重新发送邮件附件
 				if activeState != 0 && activeState != 1 {
 					resultTime := utils.StrTimeToTime(item.ActivityTime) //时间字符串格式转时间格式
@@ -727,10 +731,9 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 				if activityInfo.ActivityName != item.ActivityName || activityInfo.SigninImg == "" {
 					go cygxService.MakeActivitySigninImg(req.ActivityId)
 				}
-
+				//如果活动之前是发布的状态，那么就对公司的扣点进行更新（涉及到新老公司的扣点返点，不放在Redis统一处理了）
 				if activityInfo.PublishStatus == 1 {
-					go cygxService.UpdateYanXuanActivityPointsBillOldComapny(activityInfo, AdminUser.AdminId, itemPointsSet, itemPointsSetOld) //活动发布以及取消发布处理研选扣点,如果活动之前是发布的状态，那么就对公司的扣点进行更新（涉及到新老公司的扣点返点，不放在Redis统一处理了）
-					go elastic.AddComprehensiveActivity(item.ActivityId)                                                                       // Es添加活动
+					go cygxService.UpdateYanXuanActivityPointsBillOldComapny(activityInfo, AdminUser.AdminId, itemPointsSet, itemPointsSetOld) //活动发布以及取消发布处理研选扣点
 				}
 
 				//如果活动之前是未发布的状态，现在又发布了那么就对公司的扣点进行更新
@@ -762,7 +765,6 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 				go cygxService.UpdateResourceData(v, "activity", "add", time.Now().Format(utils.FormatDateTime))
 				go cygxService.YiDongSaveRoadshowDetail(v)
 				go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(v, AdminUser.AdminId, 1) //活动发布以及取消发布处理研选扣点
-				go elastic.AddComprehensiveActivity(v)                                                    // Es添加活动
 			}
 			go cygxService.MakeActivitySigninImg(v)
 		}
@@ -798,6 +800,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 // @Param   PublishEndDate   query   string  false       "发布结束时间，列如2021-03-06 "
 // @Param   KeyWord   query   string  false       "搜索关键词"
 // @Param   ActiveState   query   string  false       "活动进行状态 未开始：NotStarted、进行中HaveInHand、已结束Complete"
+// @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} cygx.GetCygxActivityListRep
 // @router /activity/list [get]
 func (this *ActivityCoAntroller) ActivityList() {
@@ -824,10 +827,12 @@ func (this *ActivityCoAntroller) ActivityList() {
 	publishEndDate := this.GetString("PublishEndDate")
 	keyWord := this.GetString("KeyWord")
 	activeState := this.GetString("ActiveState")
-	activityLabel := this.GetString("ActivityLabel") // 查研观向7.4-活动标签
+	activityLabel := this.GetString("ActivityLabel")   // 查研观向7.4-活动标签
+	isResearch, _ := this.GetBool("IsResearch", false) // 是否为研选 查研观向11.0 （研选活动独立显示）
 	if activeState != "HaveInHand" && activeState != "Complete" {
 		activeState = "NotStarted"
 	}
+
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -842,6 +847,11 @@ func (this *ActivityCoAntroller) ActivityList() {
 	if keyWord != "" {
 		condition += ` AND (art.activity_name LIKE '%` + keyWord + `%' )  `
 	}
+	if isResearch {
+		chartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
+	} else {
+		//condition += ` AND art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'`
+	}
 	//行业名称
 	if chartPermissionId > 0 {
 		condition += ` AND art.chart_permission_id  =  '` + strconv.Itoa(chartPermissionId) + `'`
@@ -882,9 +892,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 	}
 	// 活动标签
 	if activityLabel != "" {
-		keywords := "%" + activityLabel + "%"
-		condition += ` AND art.label LIKE ?`
-		pars = append(pars, keywords)
+		condition += ` AND (art.label LIKE '%` + activityLabel + `%' )  `
 	}
 
 	//C类电话会，仅本组销售、部门管理员、admin、权益研究员账号能看到。
@@ -1226,8 +1234,6 @@ func (this *ActivityCoAntroller) PublishAndCancel() {
 		go cygxService.YiDongUpdateActivityPublish(activityId)
 	}
 	go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(activityId, AdminUser.AdminId, item.PublishStatus) //活动发布以及取消发布处理研选扣点
-
-	go elastic.AddComprehensiveActivity(activityId) // Es添加活动
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

controllers/cygx/activity_meet.go

@@ -35,6 +35,7 @@ type ActivityMeetCoAntroller struct {
 // @Param   EndDate   query   string  false       "结束时间，列如2021-03-06 "
 // @Param   KeyWord   query   string  false       "搜索关键词"
 // @Param   MeetType   query   int  true       "会议类型 1线上、2线下"
+// @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} cygx.GetCygxMeetListRep
 // @router /activityMeet/list [get]
 func (this *ActivityMeetCoAntroller) MeetList() {
@@ -58,7 +59,7 @@ func (this *ActivityMeetCoAntroller) MeetList() {
 	endDate := this.GetString("EndDate")
 	keyWord := this.GetString("KeyWord")
 	meetType, _ := this.GetInt("MeetType")
-
+	isResearch, _ := this.GetBool("IsResearch", false) // 是否为研选 查研观向11.0 （研选活动独立显示）
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -83,6 +84,11 @@ func (this *ActivityMeetCoAntroller) MeetList() {
 	if ActivityTypeId != "" {
 		condition += ` AND a.activity_type_id IN (` + ActivityTypeId + `) `
 	}
+	if isResearch {
+		chartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
+	} else {
+		//condition += ` AND art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'`
+	}
 	//行业名称
 	if chartPermissionId > 0 {
 		condition += ` AND a.chart_permission_id  =  '` + strconv.Itoa(chartPermissionId) + `'`
@@ -341,18 +347,17 @@ func (this *ActivityMeetCoAntroller) MeetingDo() {
 		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
 		return
 	}
-	//校验活动后台管理员、销售是否有修改权限 校验需求取消 2023-7-10
-	//havePower, popupMsg, err := cygxService.CheckActivityUpdatePower(AdminUser.AdminId, activityInfo)
-	//if err != nil {
-	//	br.Msg = "获取管理员身份信息失败"
-	//	br.ErrMsg = "获取管理员身份信息失败，Err:" + err.Error()
-	//	return
-	//}
-	//if !havePower {
-	//	br.Msg = popupMsg
-	//	return
-	//}
-
+	//校验活动后台管理员、销售是否有修改权限
+	havePower, popupMsg, err := cygxService.CheckActivityUpdatePower(AdminUser.AdminId, activityInfo)
+	if err != nil {
+		br.Msg = "获取管理员身份信息失败"
+		br.ErrMsg = "获取管理员身份信息失败，Err:" + err.Error()
+		return
+	}
+	if !havePower {
+		br.Msg = popupMsg
+		return
+	}
 	noMeetingUids, err := cygx.GetSignupUserIds(activityId, meetingUids) //未到会的用户ID
 	if err != nil {
 		br.Msg = "获取信息失败"

controllers/cygx/activity_signup.go

@@ -37,6 +37,7 @@ type ActivitySignupCoAntroller struct {
 // @Param   SearchType   query   int  true       "筛选类型 1专家/分析师电话会、2专家/分析师线下沙龙 、3公司调研/、4C类电话会"
 // @Param   ActiveState   query   int  false       "发布状态 ，1未开始、2进行中、3已结束 ，默认1未开始"
 // @Param   PublishStatus   query   int  false       "发布状态 ，0未发布，1已发布，3已取消，传2查询所有"
+// @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} cygx.GetCygxSignupListRep
 // @router /activitySignup/list [get]
 func (this *ActivitySignupCoAntroller) SignupList() {
@@ -62,6 +63,7 @@ func (this *ActivitySignupCoAntroller) SignupList() {
 	activeState, _ := this.GetInt("ActiveState")
 	searchType, _ := this.GetInt("SearchType")
 	publishStatus, _ := this.GetInt("PublishStatus")
+	isResearch, _ := this.GetBool("IsResearch", false) // 是否为研选 查研观向11.0 （研选活动独立显示）
 	if activeState == 0 {
 		activeState = 1
 	}
@@ -78,7 +80,6 @@ func (this *ActivitySignupCoAntroller) SignupList() {
 	var pars []interface{}
 	if keyWord != "" {
 		template.HTMLEscapeString(keyWord)
-		fmt.Println("keyWord", keyWord)
 		keyWord = "%" + keyWord + "%"
 		condition += ` AND (art.activity_name LIKE  ? )  `
 		pars = append(pars, keyWord)
@@ -99,6 +100,11 @@ func (this *ActivitySignupCoAntroller) SignupList() {
 	if ActivityTypeId != "" {
 		condition += ` AND art.activity_type_id IN (` + ActivityTypeId + `) `
 	}
+	if isResearch {
+		chartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
+	} else {
+		//condition += ` AND art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'`
+	}
 	//行业名称
 	if chartPermissionId > 0 {
 		condition += ` AND art.chart_permission_id  =  '` + strconv.Itoa(chartPermissionId) + `'`

controllers/cygx/cygx_activity_type.go

@@ -15,6 +15,7 @@ type ActivityTypeCoAntroller struct {
 
 // @Title 活动类型列表
 // @Description活动类型列表接口
+// @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} cygx.ActivityTypeListResp
 // @router /activityType/list [get]
 func (this *ActivityTypeCoAntroller) List() {
@@ -30,8 +31,15 @@ func (this *ActivityTypeCoAntroller) List() {
 		br.Ret = 408
 		return
 	}
+	isResearch, _ := this.GetBool("IsResearch", false)
+	var condition string
 	resp := new(cygx.ActivityTypeListResp)
-	list, err := cygx.GetActivityTypeList()
+	if isResearch {
+		condition = " source_type IN (0,2) "
+	} else {
+		condition = " source_type IN (0,1) "
+	}
+	list, err := cygx.GetActivityTypeSearchList(condition)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
@@ -94,7 +102,7 @@ func (this *ActivityTypeCoAntroller) Detail() {
 
 // @Title 活动类型列表小分类筛选
 // @Description 获取活动类型列表小分类筛选接口
-// @Param   SearchType   query   int  true       "筛选类型 1专家/分析师嗲话会、2专家/分析师线下沙龙 、3公司调研/ 4、C类电话会"
+// @Param   SearchType   query   int  true       "筛选类型 1专家/分析师电话会、2专家/分析师线下沙龙 、3公司调研/ 4、C类电话会"
 // @Success 200 {object} cygx.ActivityTypeListResp
 // @router /activityType/listSearch [get]
 func (this *ActivityTypeCoAntroller) ListSearch() {
@@ -138,6 +146,7 @@ func (this *ActivityTypeCoAntroller) ListSearch() {
 // @Title 线上、线下会议类型
 // @Description 线上、线下会议类型
 // @Param   MeetType   query   int  true       "会议类型 1线上、2线下"
+// @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} cygx.ActivityTypeListResp
 // @router /activityType/meetType [get]
 func (this *ActivityTypeCoAntroller) MeetType() {
@@ -154,6 +163,7 @@ func (this *ActivityTypeCoAntroller) MeetType() {
 		return
 	}
 	meetType, _ := this.GetInt("MeetType")
+	isResearch, _ := this.GetBool("IsResearch", false) // 是否为研选 查研观向11.0 （研选活动独立显示）
 	resp := new(cygx.ActivityTypeListResp)
 	var condition string
 	if meetType == 1 {
@@ -161,6 +171,11 @@ func (this *ActivityTypeCoAntroller) MeetType() {
 	} else {
 		condition += ` activity_type  = 0 `
 	}
+	if isResearch {
+		condition += " AND  source_type IN (0,2) "
+	} else {
+		condition += " AND source_type IN (0,1) "
+	}
 	list, err := cygx.GetActivityTypeSearchList(condition)
 	if err != nil {
 		br.Msg = "获取失败"

models/cygx/activity.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hz_crm_api/utils"
 	"time"
 )
 
@@ -76,6 +77,8 @@ type ActivityRep struct {
 	IsNeedEmail             int                       `description:"是否需要提供邮箱 1是，0否"`
 	SiginupDeadline         string                    `description:"报名截止时间"`
 	IsResearchPoints        int                       `description:"是否为研选扣点  1是，0否"`
+	IsResearch              bool                      `description:"是否为研选"`
+	IsShowHz                int                       `description:"是否同时在弘则展示  1是，0否"`
 	PointsSet               *CygxActivityPointsSetRsq `description:"研选扣点明细"`
 	List                    []*ActivityGroupIndustrialRep
 	VoiceList               []*CygxActivityVoiceReq
@@ -169,63 +172,66 @@ type ActivityDetailRep struct {
 
 // 活动详情
 type CygxActivity struct {
-	ActivityId              int       `orm:"column(activity_id);pk";description:"活动ID 等于0新增活动，大于0修改活动"`
-	ActivityTypeId          int       `description:"活动类型id"`
-	ActivityTypeName        string    `description:"活动类型名称"`
-	ChartPermissionId       int       `description:"行业id"`
-	ChartPermissionName     string    `description:"行业名称"`
-	ChartPermissionNames    string    `description:"行业名称辅助字段，区分研选子分类"`
-	Body                    string    `description:"内容"`
-	CreateTime              time.Time `description:"创建时间"`
-	PublishDate             time.Time `description:"发布时间"`
-	IsLimitPeople           int       `description:"是否限制人数 1是，0否"`
-	LimitPeopleNum          int       `description:"限制的人数数量"`
-	CustomerTypeIds         string    `description:"活动可见的客户类型，多个ID用 , 隔开"`
-	PublishStatus           int       `description:"发布状态 1已发布，0未发布"`
-	LastUpdatedTime         time.Time `description:"更新时间"`
-	ActivityTime            string    `description:"活动时间"`
-	ActivityTimeText        string    `description:"活动时间带文字"`
-	DistinguishedGuest      string    `description:"嘉宾"`
-	Host                    string    `description:"主持人"`
-	MainlandTell            string    `description:"大陆拨入号"`
-	HongKongTell            string    `description:"香港拨入号"`
-	TaiwanTell              string    `description:"台湾拨入号"`
-	AmericaTell             string    `description:"美国拨入号"`
-	ParticipationCode       string    `description:"参会密码"`
-	Theme                   string    `description:"主题"`
-	Expert                  string    `description:"专家"`
-	ActivityName            string    `description:"活动名称"`
-	ActivityNameTask        string    `description:"活动名称定时任务同步的时候使用"`
-	OnlineParticipation     string    `description:"网络参会"`
-	ReportLink              string    `description:"报告链接"`
-	City                    string    `description:"城市"`
-	Address                 string    `description:"活动地址"`
-	Highlights              string    `description:"活动亮点"`
-	Remarks                 string    `description:"备注"`
-	Speaker                 string    `description:"主讲人"`
-	ArticleId               int       `description:"关联报告id"`
-	Label                   string    `description:"标签"`
-	LinkParticipants        string    `description:"链接参会"`
-	AppAttendance           string    `description:"App参会"`
-	ConferencePassword      string    `description:"会议密码"`
-	TemporaryLabel          string    `description:"临时标签"`
-	IsMakerShow             int       `description:"是否仅决策人可见 0，否 、1，是"`
-	VisibleRange            int       `description:"可见范围 1，仅本组可见 、2，全部客户可见"`
-	Scale                   string    `description:"管理规模，空不填，1：:50亿以下，2：50~100亿，3：100亿以上。多个用, 隔开"`
-	IsShowSubjectName       int       `description:"小程序内是否展示标的名称 1是 ，0 否 默认0 "`
-	IsHideAppointment       int       `description:"是否隐藏预约纪要按钮 1是 ，0 否 默认0 "`
-	AdminId                 int       `description:"销售/管理员ID"`
-	AdminName               string    `description:"销售/管理员姓名"`
-	IsCanAppointmentMinutes int       `description:"是否可预约纪要 1是 ，0 否 默认0 "`
-	IsYidongConduct         int       `description:"是否属于易董办会 1：是 、0：否"`
-	IsCanOutboundCall       int       `description:"是否提供外呼 1：是 、0：否"`
-	IsCancel                int       `description:"是否取消，1是，0否"`
-	TencentConferenceNumber string    `description:"腾讯会议号"`
-	IsExternalLabel         int       `description:"是否为外部资源 1是，0否"`
-	IsBClass                int       `description:"是否为B类电话会 1是，0否"`
-	IsNeedEmail             int       `description:"是否需要提供邮箱 1是，0否"`
-	SiginupDeadline         string    `description:"报名截止时间"`
-	IsResearchPoints        int       `description:"是否为研选扣点  1是，0否"`
+	ActivityId                int       `orm:"column(activity_id);pk";description:"活动ID 等于0新增活动，大于0修改活动"`
+	ActivityTypeId            int       `description:"活动类型id"`
+	ActivityTypeName          string    `description:"活动类型名称"`
+	ChartPermissionId         int       `description:"行业id"`
+	ChartPermissionName       string    `description:"行业名称"`
+	ChartPermissionNames      string    `description:"行业名称辅助字段，区分研选子分类"`
+	Body                      string    `description:"内容"`
+	CreateTime                time.Time `description:"创建时间"`
+	PublishDate               time.Time `description:"发布时间"`
+	IsLimitPeople             int       `description:"是否限制人数 1是，0否"`
+	LimitPeopleNum            int       `description:"限制的人数数量"`
+	CustomerTypeIds           string    `description:"活动可见的客户类型，多个ID用 , 隔开"`
+	PublishStatus             int       `description:"发布状态 1已发布，0未发布"`
+	LastUpdatedTime           time.Time `description:"更新时间"`
+	ActivityTime              string    `description:"活动时间"`
+	ActivityTimeText          string    `description:"活动时间带文字"`
+	DistinguishedGuest        string    `description:"嘉宾"`
+	Host                      string    `description:"主持人"`
+	MainlandTell              string    `description:"大陆拨入号"`
+	HongKongTell              string    `description:"香港拨入号"`
+	TaiwanTell                string    `description:"台湾拨入号"`
+	AmericaTell               string    `description:"美国拨入号"`
+	ParticipationCode         string    `description:"参会密码"`
+	Theme                     string    `description:"主题"`
+	Expert                    string    `description:"专家"`
+	ActivityName              string    `description:"活动名称"`
+	ActivityNameTask          string    `description:"活动名称定时任务同步的时候使用"`
+	OnlineParticipation       string    `description:"网络参会"`
+	ReportLink                string    `description:"报告链接"`
+	City                      string    `description:"城市"`
+	Address                   string    `description:"活动地址"`
+	Highlights                string    `description:"活动亮点"`
+	Remarks                   string    `description:"备注"`
+	Speaker                   string    `description:"主讲人"`
+	ArticleId                 int       `description:"关联报告id"`
+	Label                     string    `description:"标签"`
+	LinkParticipants          string    `description:"链接参会"`
+	AppAttendance             string    `description:"App参会"`
+	ConferencePassword        string    `description:"会议密码"`
+	TemporaryLabel            string    `description:"临时标签"`
+	IsMakerShow               int       `description:"是否仅决策人可见 0，否 、1，是"`
+	VisibleRange              int       `description:"可见范围 1，仅本组可见 、2，全部客户可见"`
+	Scale                     string    `description:"管理规模，空不填，1：:50亿以下，2：50~100亿，3：100亿以上。多个用, 隔开"`
+	IsShowSubjectName         int       `description:"小程序内是否展示标的名称 1是 ，0 否 默认0 "`
+	IsHideAppointment         int       `description:"是否隐藏预约纪要按钮 1是 ，0 否 默认0 "`
+	AdminId                   int       `description:"销售/管理员ID"`
+	AdminName                 string    `description:"销售/管理员姓名"`
+	IsCanAppointmentMinutes   int       `description:"是否可预约纪要 1是 ，0 否 默认0 "`
+	IsYidongConduct           int       `description:"是否属于易董办会 1：是 、0：否"`
+	IsCanOutboundCall         int       `description:"是否提供外呼 1：是 、0：否"`
+	IsCancel                  int       `description:"是否取消，1是，0否"`
+	TencentConferenceNumber   string    `description:"腾讯会议号"`
+	IsExternalLabel           int       `description:"是否为外部资源 1是，0否"`
+	IsBClass                  int       `description:"是否为B类电话会 1是，0否"`
+	IsNeedEmail               int       `description:"是否需要提供邮箱 1是，0否"`
+	SiginupDeadline           string    `description:"报名截止时间"`
+	IsResearchPoints          int       `description:"是否为研选扣点  1是，0否"`
+	IsShowHz                  int       `description:"是否同时在弘则展示  1是，0否"`
+	ChartPermissionIdDeputy   int       `description:"行业id"`
+	ChartPermissionNameDeputy string    `description:"行业名称"`
 }
 
 type CygxActivityEditDetail struct {
@@ -390,6 +396,11 @@ func EditActivity(item *CygxActivity, oldPublishStatus int, industrialActivityIt
 	updateParams["IsNeedEmail"] = item.IsNeedEmail
 	updateParams["SiginupDeadline"] = item.SiginupDeadline
 	updateParams["IsResearchPoints"] = item.IsResearchPoints
+	if item.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+		updateParams["IsShowHz"] = item.IsShowHz //研选的才做修改
+	}
+	updateParams["ChartPermissionNameDeputy"] = item.ChartPermissionNameDeputy
+	updateParams["ChartPermissionIdDeputy"] = item.ChartPermissionIdDeputy
 	//修改活动信息
 	ptrStructOrTableName := "cygx_activity"
 	whereParam := map[string]interface{}{"activity_id": item.ActivityId}

models/cygx/activity_type.go

@@ -6,7 +6,7 @@ import (
 
 type ActivityType struct {
 	ActivityTypeId   int    `description:"活动类型id"`
-	ActivityTypeName string `description:"活动名称"`
+	ActivityTypeName string `description:"活动类型名称"`
 	TemplateP        string `description:"活动模板，带P标签"`
 	Template         string `description:"活动模板"`
 	ZoomTemplateP    string `description:"Zoom活动模板，带P标签"`