Jelajahi Sumber

Merge branch 'cygx_7.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

xingzai 2 tahun lalu
induk
melakukan
35a5955912
4 mengubah file dengan 35 tambahan dan 274 penghapusan
  1. 5 252
      controllers/activity.go
  2. 11 4
      models/activity.go
  3. 10 9
      models/wx_user.go
  4. 9 9
      routers/commentsRouter.go

+ 5 - 252
controllers/activity.go

@@ -429,7 +429,7 @@ func (this *ActivityCoAntroller) ScheduleList() {
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
-	var list []*models.CygxActivityList
+	var list []*models.ActivityDetail
 	//全部都是进行中的活动
 	if totalCount > currentIndex*pageSize {
 		condition += ` AND art.active_state IN(2) `
@@ -786,13 +786,6 @@ func (this *ActivityCoAntroller) Detail() {
 				resp.PopupMsg = "您暂无权限参加此活动,若想参加可以申请开通对应的试用权限"
 				resp.MsgType = "Type"
 			} else {
-				//if strings.Contains("医药,消费,科技,智造", activityInfo.ChartPermissionName) {
-				//	if activityInfo.ActivityTypeId == 1 || activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 5 || activityInfo.ActivityTypeId == 6 {
-				//		activityInfo.ChartPermissionName += "(主观)"
-				//	} else {
-				//		activityInfo.ChartPermissionName += "(客观)"
-				//	}
-				//}
 				resp.PopupMsg = "您暂无权限参加此活动,若想参加可以申请开通对应的试用权限"
 				resp.MsgType = "Industry"
 			}
@@ -804,7 +797,6 @@ func (this *ActivityCoAntroller) Detail() {
 			} else {
 				hasPermission = 5
 			}
-
 		}
 	} else { //潜在客户
 		if applyCount > 0 {
@@ -1891,7 +1883,7 @@ func (this *ActivityABaseController) FastSearch() {
 // @Param   WhichDay   query   string  false       "哪一天 今天:1、明天:2,多个用 , 隔开"
 // @Param   Label   query   string  false       "搜索主题 多个用 , 隔开 (空为活动主题,非空为更多主题)"
 // @Success 200 {object} models.GetCygxActivityLabelListRep
-// @router /labelList [get]
+// @router /labelList_deltest [get]
 func (this *ActivityCoAntroller) LabelList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
@@ -2243,7 +2235,7 @@ func (this *ActivityCoAntroller) AskAdd() {
 // @Param   WhichDay   query   string  false       "哪一天 今天:1、明天:2,多个用 , 隔开"
 // @Param   IsPower   query   int  false       "是否选择有权限行业 ,1是 0 否 默认0"
 // @Success 200 {object} models.ActivityTypeListHomeResp
-// @router /labelTypeList [get]
+// @router /labelTypeList_deltest [get]
 func (this *ActivityCoAntroller) LabelTypeList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
@@ -2657,104 +2649,12 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	var condition string
 	var pars []interface{}
 	//活动可见限制
-	//var sqlExport string
-	//slicePer := strings.Split(permissionStr, ",")
-	//var permissionSqlStr string
-	//for _, v := range slicePer {
-	//	if userType == 1 {
-	//		//if v != "研选" {
-	//		if !strings.Contains(v, "研选") {
-	//			permissionSqlStr += "'" + v + "',"
-	//		}
-	//	} else {
-	//		permissionSqlStr += "'" + v + "',"
-	//	}
-	//}
-	//permissionSqlStr = strings.TrimRight(permissionSqlStr, ",")
-	//permissionSqlStr = strings.Replace(permissionSqlStr, "(主观)", "", -1)
-	//permissionSqlStr = strings.Replace(permissionSqlStr, "(客观)", "", -1)
-	//permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionSqlStr + `)`
-	//sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
-	//if userType == 2 {
-	//	sqlExport += ` OR  art.customer_type_ids LIKE '%3%' `
-	//}
-	//if (userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
-	//	sqlExport += ` OR  art.customer_type_ids LIKE '%4%' `
-	//}
-	//sqlExport += `) `
-	//
-	////主题
-	//if label != "" {
-	//	condition = ` AND art.label  LIKE '%` + label + `%' `
-	//}
-	//if whichDay != "" {
-	//	var startDate string
-	//	var endDate string
-	//	if whichDay == "1" {
-	//		startDate = time.Now().Format(utils.FormatDate)
-	//		endDate = startDate
-	//	} else if whichDay == "2" {
-	//		startDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-	//		endDate = startDate
-	//	} else {
-	//		startDate = time.Now().Format(utils.FormatDate)
-	//		endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-	//	}
-	//	condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
-	//	condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
-	//}
-	////行业名称
-	//if len(chartPermissionIds) > 0 {
-	//	condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-	//}
-	//if activeState != "" {
-	//	if activeState == "1" {
-	//		condition += ` AND art.active_state  IN (1,2)`
-	//	} else {
-	//		condition += ` AND art.active_state  IN (` + activeState + `)`
-	//	}
-	//} else {
-	//	condition += ` AND art.active_state  IN (1)`
-	//}
-	//if activityTypeId != "" {
-	//	condition += ` AND art.activity_type_id  IN (` + activityTypeId + `)`
-	//}
-	//
-	//condition += ` AND art.publish_status = 1 `
-	//var conditionOr string
-	//// 有专家权限的这几种用户,不做行业权限校验
-	//if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-	//	conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-	//}
-	//if (userType == 5) && strings.Contains(permissionStr, "专家") {
-	//	conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-	//}
-	//if userType == 1 {
-	//	conditionOr += `	OR ( art.is_limit_people = 0 	  ` + condition + permissionSqlStr + `) `
-	//} else {
-	//	conditionOr += `	OR ( art.is_limit_people = 0 	  ` + condition + `) `
-	//}
-	////判断客户规模是否属于可见范围的活动
-	//companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-	//if err != nil && err.Error() != utils.ErrNoRow() {
-	//	br.Msg = "获取信息失败"
-	//	br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-	//	return
-	//}
-	//if companyProduct != nil {
-	//	if companyProduct.Scale != "" {
-	//		conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
-	//	}
-	//}
-
 	conditionActivity, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取活动权限数据失败,Err:" + err.Error()
 		return
 	}
-
-	//condition += ` AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
 	condition += ` AND art.is_limit_people = 1 ` + conditionActivity
 	total, err := models.GetActivityCount(condition, pars)
 	if err != nil {
@@ -2877,7 +2777,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 // @Param   WhichDay   query   string  false       "哪一天 今天:1、明天:2,多个用 , 隔开"
 // @Param   IsPower   query   int  false       "是否选择有权限行业 ,1是 0 否 默认0"
 // @Success 200 {object} models.ActivityTypeListHomeRespPc
-// @router /labelTypeListPc [get]
+// @router /labelTypeListPc_deltest [get]
 func (this *ActivityCoAntroller) LabelTypeListPc() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
@@ -3340,91 +3240,12 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 			continue
 		}
 		var condition string
-		//var conditionAdmin string
-		//permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionNameStr + `)`
-		//sqlExport = ` AND (art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%' `
-		//if userType == 2 {
-		//	sqlExport += ` OR  art.customer_type_ids LIKE '%3%' `
-		//}
-		//if (userType == 2 || userType == 3) && strings.Contains(permissionStr, "专家") {
-		//	sqlExport += ` OR  art.customer_type_ids LIKE '%4%' `
-		//}
-		//sqlExport += `) `
-		//if v.ActivityTypeId == utils.ANALYST_TELL_ACTIVITY_TYPE_ID {
-		//	condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id IN (` + strconv.Itoa(v.ActivityTypeId) + "," + strconv.Itoa(utils.C_CLASS_ACTIVITY_TYPE_ID) + `)`
-		//} else {
-		//	condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id = ` + strconv.Itoa(v.ActivityTypeId)
-		//}
-		////活动仅决策人可见
-		//if isMaker == 0 {
-		//	condition += ` AND art.is_maker_show = 0  `
-		//}
-		//
-		//if isPower == 1 {
-		//	condition += permissionSqlStr
-		//}
-		////行业名称
-		//if len(chartPermissionIds) > 0 {
-		//	condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-		//}
-		//var conditionOr string
-		//if whichDay != "" {
-		//	var startDate string
-		//	var endDate string
-		//	if whichDay == "1" {
-		//		startDate = time.Now().Format(utils.FormatDate)
-		//		endDate = startDate
-		//	} else if whichDay == "2" {
-		//		startDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-		//		endDate = startDate
-		//	} else {
-		//		startDate = time.Now().Format(utils.FormatDate)
-		//		endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-		//	}
-		//	condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
-		//	condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
-		//}
-		//if activeState != "" {
-		//	// 默认查看未开始跟进行中
-		//	if activeState == "1" {
-		//		condition += ` AND art.active_state  IN (1,2)`
-		//	} else {
-		//		condition += ` AND art.active_state  IN (` + activeState + `)`
-		//	}
-		//} else {
-		//	condition += ` AND art.active_state  IN (1,2)`
-		//}
-		//conditionAdmin = condition
-		////查询全部可见的数据(是否全部客户可见)
-		//condition += ` AND art.visible_range != 1  `
-		//
-		//if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-		//	conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-		//}
-		//if (userType == 5) && strings.Contains(permissionStr, "专家") {
-		//	conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-		//}
-		//if userType == 1 {
-		//	conditionOr += ` OR ( art.is_limit_people = 0 ` + condition + permissionSqlStr + `) `
-		//} else {
-		//	conditionOr += ` OR ( art.is_limit_people = 0 ` + condition + `) `
-		//}
-		//if companyProduct != nil {
-		//	if companyProduct.Scale != "" {
-		//		conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
-		//	}
-		//}
-		//if adminIds != "" {
-		//	conditionOr += ` OR ( art.admin_id IN (` + adminIds + `) ` + conditionAdmin + `) `
-		//}
-
 		conditionActivity, err := services.GetActivityonditionList(user, strconv.Itoa(v.ActivityTypeId), chartPermissionIds, whichDay, activeState, "", isPower)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取活动权限数据失败,Err:" + err.Error()
 			return
 		}
-		//fmt.Println(conditionActivity)
 		condition += `AND art.is_limit_people = 1 ` + conditionActivity
 		sortTime = ` mintimesort ASC `
 		labelList, err := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, pageSize)
@@ -4405,75 +4226,7 @@ func (this *ActivityCoAntroller) LabelTypeListV6Pc() {
 			continue
 		}
 		var condition string
-		//var conditionAdmin string
-		//permissionSqlStr = ` AND art.chart_permission_name  IN (` + permissionNameStr + `)`
-		//if v.ActivityTypeId == utils.ANALYST_TELL_ACTIVITY_TYPE_ID {
-		//	condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id IN (` + strconv.Itoa(v.ActivityTypeId) + "," + strconv.Itoa(utils.C_CLASS_ACTIVITY_TYPE_ID) + `)`
-		//} else {
-		//	condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id = ` + strconv.Itoa(v.ActivityTypeId)
-		//}
-		////活动仅决策人可见
-		//if isMaker == 0 {
-		//	condition += ` AND art.is_maker_show = 0  `
-		//}
-		//
-		////condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id = ` + strconv.Itoa(v.ActivityTypeId)
-		//if isPower == 1 {
-		//	condition += permissionSqlStr
-		//}
-		////行业名称
-		//if len(chartPermissionIds) > 0 {
-		//	condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-		//}
-		//var conditionOr string
-		//if whichDay != "" {
-		//	var startDate string
-		//	var endDate string
-		//	if whichDay == "1" {
-		//		startDate = time.Now().Format(utils.FormatDate)
-		//		endDate = startDate
-		//	} else if whichDay == "2" {
-		//		startDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-		//		endDate = startDate
-		//	} else {
-		//		startDate = time.Now().Format(utils.FormatDate)
-		//		endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-		//	}
-		//	condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
-		//	condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
-		//}
-		//
-		//if activeState != "" {
-		//	condition += ` AND art.active_state  IN (` + activeState + `)`
-		//} else {
-		//	condition += ` AND art.active_state  IN (1,2)`
-		//}
-		//
-		//conditionAdmin = condition
-		////查询全部可见的数据(是否全部客户可见)
-		//condition += ` AND art.visible_range != 1  `
-		//
-		//if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-		//	conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-		//}
-		//if (userType == 5) && strings.Contains(permissionStr, "专家") {
-		//	conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-		//}
-		//if userType == 1 {
-		//	conditionOr += ` OR ( art.is_limit_people = 0 ` + condition + permissionSqlStr + `) `
-		//} else {
-		//	conditionOr += ` OR ( art.is_limit_people = 0 ` + condition + `) `
-		//}
-		//
-		//if companyProduct != nil {
-		//	if companyProduct.Scale != "" {
-		//		conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
-		//	}
-		//}
-		//
-		//if adminIds != "" {
-		//	conditionOr += ` OR ( art.admin_id IN (` + adminIds + `) ` + conditionAdmin + `) `
-		//}
+
 		conditionActivity, err := services.GetActivityonditionList(user, strconv.Itoa(v.ActivityTypeId), chartPermissionIds, whichDay, activeState, "", isPower)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"

+ 11 - 4
models/activity.go

@@ -110,6 +110,13 @@ type ActivityDetail struct {
 	IsHideAppointment       int    `description:"是否隐藏预约纪要按钮  1是,0 否"`
 	IsCClassMeeting         bool   `description:"是否是c类电话会"`
 	ArticleList             []*ActivityArticleResp
+	// 列表添加的部分结构体
+	IsBrackets        int    `description:"是否有方括号 1是 ,0 否"`
+	Label             string `description:"主题标签"`
+	ImgUrl            string `description:"图片链接"`
+	ImgUrlText        string `description:"图片链接文字"`
+	ActivityType      int    `description:"活动线上线下类型 1线上,0 线下"`
+	JmcjRoadshowTitle string `description:"进门财经手动匹配的活动名称"`
 }
 
 type CygxActivityResp struct {
@@ -151,7 +158,7 @@ func GetAddActivityInfoByIdShow(uid, ActivityId int) (item *ActivityDetail, err
 	return
 }
 
-//活动详情
+//活动列表
 type CygxActivityList struct {
 	ActivityId              int    `orm:"column(activity_id);pk";description:"活动ID 等于0新增活动,大于0修改活动"`
 	ActivityTypeId          int    `description:"活动类型id"`
@@ -188,13 +195,13 @@ type CygxActivityList struct {
 
 type GetCygxActivityListRep struct {
 	Paging *paging.PagingItem `description:"分页数据"`
-	List   []*CygxActivityList
+	List   []*ActivityDetail
 	Label  string `description:"主题"`
 	ImgUrl string `description:"图片路径"`
 }
 
 //列表
-func GetActivityListAll(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*CygxActivityList, err error) {
+func GetActivityListAll(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*ActivityDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.* ,t.activity_type,t.img_url_text,c.image_url as  img_url,
 		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ?   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS is_signup,
@@ -253,7 +260,7 @@ func GetScheduleCount(condition string, uid int) (count int, err error) {
 }
 
 //我的日程列表
-func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*CygxActivityList, err error) {
+func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*ActivityDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.*,t.activity_type,t.img_url_text,c.image_url as  img_url,
 			( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ? AND s.is_cancel = 0 AND s.do_fail_type = 0) AS is_signup,

+ 10 - 9
models/wx_user.go

@@ -546,6 +546,16 @@ func GetCygxCompanyUserUserInteraction(userIds string) (items []*CygxUserInterac
 	return
 }
 
+// GetWxUserListByUserIds 根据用户ID集合获取用户
+func GetWxUserListByUserIds(userIds string) (list []*WxUserItem, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT u.*, c.company_name FROM wx_user AS u
+			INNER JOIN company AS c ON c.company_id = u.company_id 
+			WHERE user_id IN (` + userIds + `) `
+	_, err = o.Raw(sql).QueryRows(&list)
+	return
+}
+
 // GetWxUserByMobiles 根据用户手机号获取用户详情
 func GetWxUserByMobiles(mobiles []string) (items []*WxUser, err error) {
 	lenmobiles := len(mobiles)
@@ -555,15 +565,6 @@ func GetWxUserByMobiles(mobiles []string) (items []*WxUser, err error) {
 	sql := `SELECT* FROM wx_user  WHERE mobile in (` + utils.GetOrmInReplace(lenmobiles) + `)  `
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, mobiles).QueryRows(&items)
-	return
-}
 
-// GetWxUserListByUserIds 根据用户ID集合获取用户
-func GetWxUserListByUserIds(userIds string) (list []*WxUserItem, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT u.*, c.company_name FROM wx_user AS u
-			INNER JOIN company AS c ON c.company_id = u.company_id 
-			WHERE user_id IN (` + userIds + `) `
-	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }

+ 9 - 9
routers/commentsRouter.go

@@ -82,7 +82,7 @@ func init() {
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
             Method: "LabelList",
-            Router: `/labelList`,
+            Router: `/labelList_deltest`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -99,8 +99,8 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
-            Method: "LabelTypeList",
-            Router: `/labelTypeList`,
+            Method: "LabelTypeListPc",
+            Router: `/labelTypeListPc_deltest`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -108,8 +108,8 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
-            Method: "LabelTypeListPc",
-            Router: `/labelTypeListPc`,
+            Method: "LabelTypeListV5",
+            Router: `/labelTypeListV5`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -117,8 +117,8 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
-            Method: "LabelTypeListV5",
-            Router: `/labelTypeListV5`,
+            Method: "LabelTypeListV6Pc",
+            Router: `/labelTypeListV6Pc`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -126,8 +126,8 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
-            Method: "LabelTypeListV6Pc",
-            Router: `/labelTypeListV6Pc`,
+            Method: "LabelTypeList",
+            Router: `/labelTypeList_deltest`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,