Эх сурвалжийг харах

Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into crm/crm_16.5

zhangchuanxing 2 сар өмнө
parent
commit
8aff0c7e7c

+ 28 - 12
controllers/company_share.go

@@ -78,12 +78,19 @@ func (this *CompanyController) CompanyShare() {
 		return
 	}
 	//新增操作记录
-	//{
-	//	remark := "移动到:" + seller.RealName
-	//	operation := "move_seller"
-	//	services.AddCompanyOperationRecord(req.CompanyId, seller.AdminId, sysUser.AdminId, productId, sysUser.AdminId, cp.CompanyName,
-	//		cp.ProductName, sysUser.RealName, remark, operation, "", sysUser.RealName, "", cp.Status)
-	//}
+	{
+		var remark string
+		var operation string
+		if req.IsShare == 1 {
+			remark = "设置共享"
+			operation = "set_share"
+		} else {
+			remark = "取消共享"
+			operation = "cancel_share"
+		}
+		services.AddCompanyOperationRecord(req.CompanyId, companyProductItem.SellerId, sysUser.AdminId, productId, sysUser.AdminId, companyProductItem.CompanyName,
+			companyProductItem.ProductName, sysUser.RealName, remark, operation, "", sysUser.RealName, "", companyProductItem.Status)
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -754,6 +761,7 @@ func (this *CompanyController) MoveShareSeller() {
 		br.ErrMsg = "查找客户失败,Err:" + err.Error()
 		return
 	}
+	oldShareSellerId := companyProductItem.ShareSellerId
 
 	//待更新字段
 	updateCol := make([]string, 0)
@@ -772,13 +780,21 @@ func (this *CompanyController) MoveShareSeller() {
 	{
 		services.UpdateCompanyContractSellerMove(req.CompanyId, productId) //益客户移动所属销售之后,更新所关联的销售信息
 	}
+
 	//新增操作记录
-	//{
-	//	remark := "移动到:" + seller.RealName
-	//	operation := "move_seller"
-	//	services.AddCompanyOperationRecord(req.CompanyId, seller.AdminId, sysUser.AdminId, productId, sysUser.AdminId, cp.CompanyName,
-	//		cp.ProductName, sysUser.RealName, remark, operation, "", sysUser.RealName, "", cp.Status)
-	//}
+	{
+		var remark string
+		var operation string
+		if oldShareSellerId == 0 {
+			remark = "分配给" + seller.RealName
+			operation = "set_share_seller"
+		} else {
+			remark = "移动到" + seller.RealName
+			operation = "set_share_seller"
+		}
+		services.AddCompanyOperationRecord(req.CompanyId, seller.AdminId, sysUser.AdminId, productId, sysUser.AdminId, companyProductItem.CompanyName,
+			companyProductItem.ProductName, sysUser.RealName, remark, operation, "", sysUser.RealName, "", companyProductItem.Status)
+	}
 	//变更销售员与联系人关系
 	//_ = models.UpdateUserSellerRelationByCompanyId(req.CompanyId, productId, seller.AdminId, seller.RealName)
 

+ 6 - 2
controllers/cygx/morning_meeting_review.go

@@ -256,6 +256,7 @@ func (this *MorningMeetingController) PreserveAndPublish() {
 		} else {
 			for _, item := range reqList.List {
 				go services.SendWxMsgWithCygxMorningMeeting(int(meetingId), item.IndustryId, item.IndustryName)
+				go cygxService.UpdateIndustrialManagementTimeLineDateList3ByRedis(item.IndustryId) //处理产业管理时间线相关内容的数据
 			}
 			//添加到首页最新
 			listchapter, err := cygx.GetCygxMorningMeetingReviewsListById(int(meetingId))
@@ -440,6 +441,7 @@ func (this *MorningMeetingController) PreserveAndPublish() {
 		} else {
 			for _, item := range reqList.List {
 				go services.SendWxMsgWithCygxMorningMeeting(reqList.MeetingId, item.IndustryId, item.IndustryName)
+				go cygxService.UpdateIndustrialManagementTimeLineDateList3ByRedis(item.IndustryId) //处理产业管理时间线相关内容的数据
 			}
 			for _, itemchapter := range listchapter {
 				//go cygxService.UpdateResourceData(itemchapter.Id, "meetingreviewchapt", "add", time.Now().Format(utils.FormatDateTime))
@@ -599,6 +601,7 @@ func (this *MorningMeetingController) PublishReport() {
 		for _, item := range list {
 			fmt.Println(item.Id)
 			go services.SendWxMsgWithCygxMorningMeeting(vint, item.IndustryId, item.IndustryName)
+			go cygxService.UpdateIndustrialManagementTimeLineDateList3ByRedis(item.IndustryId) //处理产业管理时间线相关内容的数据
 			//go cygxService.UpdateResourceData(item.Id, "meetingreviewchapt", "add", time.Now().Format(utils.FormatDateTime))
 			go cygxService.UpdateMeetingreviewchaptResourceData(item.Id) //写入首页最新  cygx_resource_data 表
 			go elastic.AddComprehensiveMeetingreviewchapt(item.Id)       //Es添加晨会精华
@@ -648,8 +651,9 @@ func (this *MorningMeetingController) PublishCancleReport() {
 	}
 	for _, item := range list {
 		//go cygxService.UpdateResourceData(item.Id, "meetingreviewchapt", "delete", time.Now().Format(utils.FormatDateTime))
-		go cygxService.UpdateMeetingreviewchaptResourceData(item.Id) //写入首页最新  cygx_resource_data 表
-		go elastic.DeleteComprehensiveMeetingreviewchapt(item.Id)    //Es删除晨会精华
+		go cygxService.UpdateMeetingreviewchaptResourceData(item.Id)                       //写入首页最新  cygx_resource_data 表
+		go elastic.DeleteComprehensiveMeetingreviewchapt(item.Id)                          //Es删除晨会精华
+		go cygxService.UpdateIndustrialManagementTimeLineDateList3ByRedis(item.IndustryId) //处理产业管理时间线相关内容的数据
 	}
 	var condition string
 	var pars []interface{}

+ 19 - 10
controllers/statistic_company_merge.go

@@ -391,7 +391,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		}
 		notRenewalCompanyTotal = total
 
-		notRenewalCompanyToBeConfirmTotal, err = company.GetIncrementalRenewalCompanyProductMergeCount(notRenewalToBeCondition, notRenewalToBePars)
+		notRenewalCompanyToBeConfirmTotal, err = company.GetIncrementalRenewalCompanyProductMergeCount(notRenewalToBeCondition+` AND a.not_renewal_hide = 0  AND c.status not in ("永续","正式","关闭") `, notRenewalToBePars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -399,8 +399,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		}
 
 		if isConfirm != 2 {
-			condition1 += `  AND a.not_renewal_hide = 0 `
-			condition1 += ` AND c.status not in ("永续","正式","关闭")  `
+			condition1 += `  AND a.not_renewal_hide = 0  AND c.status not in ("永续","正式","关闭") `
 		}
 
 		//if isConfirm == 1 {
@@ -2495,20 +2494,30 @@ func init16_1_04() {
 //	fmt.Println("end")
 //}
 
-func init16_1_06() {
+//func init() {
+//	UpdateCompanyContracthide(5593)
+//}
+
+func UpdateCompanyContracthide(companyId int) {
 	var condition string
 	var pars []interface{}
 
-	listContractMax, e := company.GetCompanyContracListInit(condition, pars)
+	if companyId > 0 {
+		condition = ` AND a.company_id = ? `
+		pars = append(pars, companyId)
+	}
+
+	listContractMax, e := company.GetCompanyContracListMaxStartDate(condition, pars)
 	if e != nil {
 		fmt.Println(e)
 		return
 	}
-	maxId := make(map[int]int)
+	maxId := make(map[int]time.Time)
 	for _, v := range listContractMax {
-		maxId[v.MaxCompanyContractId] = v.MaxCompanyContractId
+		maxId[v.CompanyId] = v.MaxStartDate
 	}
 
+	fmt.Println(maxId[5593])
 	listContract, e := company.GetCompanyContracListInit_CRM_16_1(condition, pars)
 	if e != nil {
 		fmt.Println(e)
@@ -2516,14 +2525,14 @@ func init16_1_06() {
 	}
 	var updateId []string
 	for _, v := range listContract {
-		if maxId[v.CompanyContractId] > 0 {
+		if v.EndDate.After(maxId[v.CompanyId]) {
 			continue
 		}
 		updateId = append(updateId, strconv.Itoa(v.CompanyContractId))
 	}
 
-	err := company.UpdateCompanyContracthide(updateId)
-	fmt.Println((err))
+	//err := company.UpdateCompanyContracthide(updateId)
+	//fmt.Println((err))
 	fmt.Println((updateId))
 }
 

+ 31 - 43
models/company/company_contract.go

@@ -296,7 +296,7 @@ func GetCompanyContracDetail(condition string, pars []interface{}) (item *Compan
 	return
 }
 
-// 通过ID获取详情
+// 通过获取列表详情
 func GetCompanyContracList(condition string, pars []interface{}) (items []*CompanyContractResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM company_contract  WHERE 1= 1 ` + condition
@@ -418,7 +418,8 @@ type CompanyContractRespInit struct {
 	CompanyProductId     int       `description:"客户产品id"`
 	ContractCode         string    `description:"合同编码"`
 	StartDate            string    `description:"合同开始时间"`
-	EndDate              string    `description:"合同结束时间"`
+	EndDate              time.Time `description:"合同结束时间"`
+	MaxStartDate         time.Time `description:"合同结束时间"`
 	Money                float64   `description:"合同金额"`
 	PayMethod            string    `description:"支付方式"`
 	PayChannel           string    `description:"支付渠道"`
@@ -433,31 +434,24 @@ type CompanyContractRespInit struct {
 }
 
 // 通过ID获取详情
-func GetCompanyContracListInit(condition string, pars []interface{}) (items []*CompanyContractRespInit, err error) {
+func GetCompanyContracListMaxStartDate(condition string, pars []interface{}) (items []*CompanyContractRespInit, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-	MAX( company_contract_id ) AS max_company_contract_id,
-	COUNT(a.company_id) AS cc ,
-	a.* 
-FROM
-	company_contract a
-	JOIN company b ON a.company_id = b.company_id
-	JOIN company_product c ON a.company_id = c.company_id 
-	AND a.product_id = c.product_id 
-WHERE
-	1 = 1 -- 		AND b.company_name LIKE "%上海亘%"
-	
-	AND c.product_id = 2 -- 		AND b.company_name LIKE "%上海亘%"
-	
-	AND c.product_id = 2 
-	AND a.not_renewal_hide = 0 
-	AND a.STATUS = 1 
-	AND c.STATUS NOT IN ( "永续", "正式", "关闭" ) 
-	
-	AND a.company_contract_id  NOT IN (SELECT company_contract_id FROM company_contract_no_renewed_ascribe )
-GROUP BY
-	a.company_id
- ` + condition
+			MAX( a.start_date ) AS max_start_date,
+			COUNT(a.company_id) AS cc ,
+			a.* 
+		FROM
+			company_contract a
+			JOIN company b ON a.company_id = b.company_id
+			JOIN company_product c ON a.company_id = c.company_id 
+			AND a.product_id = c.product_id 
+		WHERE
+			1 = 1 
+			
+			AND c.product_id = 2 
+			AND a.not_renewal_hide = 0 
+			AND a.STATUS = 1 
+			AND a.company_contract_id  NOT IN (SELECT company_contract_id FROM company_contract_no_renewed_ascribe )` + condition + ` GROUP BY a.company_id `
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
@@ -466,24 +460,18 @@ GROUP BY
 func GetCompanyContracListInit_CRM_16_1(condition string, pars []interface{}) (items []*CompanyContractRespInit, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-	a.* 
-FROM
-	company_contract a
-	JOIN company b ON a.company_id = b.company_id
-	JOIN company_product c ON a.company_id = c.company_id 
-	AND a.product_id = c.product_id 
-WHERE
-	1 = 1 -- 		AND b.company_name LIKE "%上海亘%"
-	
-	AND c.product_id = 2 -- 		AND b.company_name LIKE "%上海亘%"
-	
-	AND c.product_id = 2 
-	AND a.not_renewal_hide = 0 
-	AND a.STATUS = 1 
-	AND c.STATUS NOT IN ( "永续", "正式", "关闭" ) 
-
-	AND a.company_contract_id  NOT IN (SELECT company_contract_id FROM company_contract_no_renewed_ascribe )
- ` + condition
+			a.* 
+		FROM
+			company_contract a
+			JOIN company b ON a.company_id = b.company_id
+			JOIN company_product c ON a.company_id = c.company_id 
+			AND a.product_id = c.product_id 
+		WHERE
+			1 = 1 
+			AND c.product_id = 2
+			AND a.not_renewal_hide = 0 
+			AND a.STATUS = 1 
+			AND a.company_contract_id  NOT IN (SELECT company_contract_id FROM company_contract_no_renewed_ascribe ) ` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

+ 4 - 3
services/company_apply/company_approval.go

@@ -423,9 +423,10 @@ func Approved(approvalRecord *contract.ContractApprovalRecord, opUser *system.Ad
 				cygxService.YanXuanCompanyApproval(recordInfo.CompanyId, recordInfo.CompanyContractId) //研选审批通过的时候研选扣点更新
 				cygxService.HandleCompanyContractTypeByRaiXClass(recordInfo.CompanyContractId)         //所有x类试用转正的合同都记为 :打分派点
 				//cygxService.HandleAllocationCompanyContractByYanXuan(recordInfo.CompanyContractId)     //如果合同只有研选的时候,自动处理派点
-				cygxService.HandleCompanyContractPackageDifference(recordInfo.CompanyContractId)      // 更新与上一份合同的金额的对比 '增加套餐','减少套餐','维持套餐'
-				cygxService.HandleCompanyContractPermissionContractType(recordInfo.CompanyContractId) // 更新合同权限表中的权限名称,以及对应的行业权限类型(行业新签、行业续约)
-				services.UpdateCompanyProductSellerMove(recordInfo.CompanyId, recordInfo.ProductId)   // 权益客户创建新的有效合同之后,更新所关联的销售信息
+				cygxService.HandleCompanyContractPackageDifference(recordInfo.CompanyContractId)          // 更新与上一份合同的金额的对比 '增加套餐','减少套餐','维持套餐'
+				cygxService.HandleCompanyContractPermissionContractType(recordInfo.CompanyContractId)     // 更新合同权限表中的权限名称,以及对应的行业权限类型(行业新签、行业续约)
+				services.UpdateCompanyProductSellerMove(recordInfo.CompanyId, recordInfo.ProductId)       // 权益客户创建新的有效合同之后,更新所关联的销售信息
+				services.UpdateCompanyContracthideBycompanyId(recordInfo.CompanyId, recordInfo.ProductId) // 权益客户创建新的有效合同之后,对相关合同进行隐藏
 			}
 		}()
 	} else {

+ 63 - 0
services/company_contract.go

@@ -6,6 +6,7 @@ import (
 	"hongze/hz_crm_api/models/company"
 	"hongze/hz_crm_api/services/alarm_msg"
 	"hongze/hz_crm_api/utils"
+	"strconv"
 	"time"
 )
 
@@ -525,3 +526,65 @@ func UpdateCompanyProductSellerMove(companyId, productId int) {
 
 	return
 }
+
+//func init() {
+//	UpdateCompanyContracthideBycompanyId(5593, 2)
+//}
+
+// 权益客户创建新的有效合同之后,对相关合同进行隐藏
+func UpdateCompanyContracthideBycompanyId(companyId, productId int) {
+	if productId != utils.COMPANY_PRODUCT_RAI_ID {
+		return
+	}
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go alarm_msg.SendAlarmMsg("权益客户创建新的有效合同之后,对相关合同进行隐藏,UpdateCompanyContracthideBycompanyId "+fmt.Sprint("companyId:", companyId, ";err:", err), 3)
+		}
+	}()
+
+	var condition string
+	var pars []interface{}
+
+	if companyId > 0 {
+		condition = ` AND a.company_id = ? `
+		pars = append(pars, companyId)
+	}
+
+	listContractMax, e := company.GetCompanyContracListMaxStartDate(condition, pars)
+	if e != nil {
+		err = errors.New("GetCompanyContracListMaxStartDate, Err: " + e.Error())
+		return
+	}
+	//如果合同结束时间,早于最新一份合同的开始时间,这份合同就隐藏
+	maxId := make(map[int]time.Time)
+	for _, v := range listContractMax {
+		maxId[v.CompanyId] = v.MaxStartDate
+	}
+
+	listContract, e := company.GetCompanyContracListInit_CRM_16_1(condition, pars)
+	if e != nil {
+		err = errors.New("GetCompanyContracListInit_CRM_16_1, Err: " + e.Error())
+		return
+	}
+	var updateId []string
+	for _, v := range listContract {
+		if v.EndDate.After(maxId[v.CompanyId]) {
+			continue
+		}
+		updateId = append(updateId, strconv.Itoa(v.CompanyContractId))
+	}
+
+	if len(updateId) == 0 {
+		return
+	}
+	e = company.UpdateCompanyContracthide(updateId)
+	if e != nil {
+		err = errors.New("UpdateCompanyContracthide, Err: " + e.Error())
+		return
+	}
+	fmt.Println((updateId))
+
+	return
+}

+ 45 - 9
services/cygx/contract_allocation.go

@@ -399,6 +399,25 @@ func HandleAllocationCompanyContractByYanXuan(companyContractId int) (err error)
 //
 //}
 
+//func init() {
+//	var condition string
+//	var pars []interface{}
+//	condition = " AND product_id = 2  AND package_difference != ''  "
+//	companyContracList, e := company.GetCompanyContracList(condition, pars)
+//	if e != nil {
+//		fmt.Println(e)
+//		return
+//	}
+//	for k, v := range companyContracList {
+//		fmt.Println("k", k, "v.CompanyContractId", v.CompanyContractId)
+//		HandleCompanyContractPackageDifference(v.CompanyContractId)
+//	}
+//
+//	fmt.Println("endened")
+//	//condition = " AND company_contract_id = ?  "
+//	//HandleCompanyContractPackageDifference(3038)
+//}
+
 // HandleCompanyContractPackageDifference 更新与上一份合同的金额的对比 '增加套餐','减少套餐','维持套餐'
 func HandleCompanyContractPackageDifference(companyContractId int) (err error) {
 	defer func() {
@@ -417,30 +436,47 @@ func HandleCompanyContractPackageDifference(companyContractId int) (err error) {
 		err = errors.New("GetCompanyContracDetail,detail Err: " + e.Error())
 		return
 	}
+	if detail.ProductId != 2 {
+		return
+	}
+
+	startYeaar := utils.StrDateToDate(detail.StartDate).Year()
+
+	lastYearStartData := fmt.Sprint(startYeaar-1, "-01-01")
+	lastYearEndData := fmt.Sprint(startYeaar-1, "-12-31")
+	//fmt.Println(lastYearStartData)
+	//fmt.Println(lastYearEndData)
+
+	//return
 
 	//如果不是续约合同就不做对比处理
 	if detail.ContractType != "续约合同" {
 		return
 	}
-	//获取前一份合同的信息
+	//获取前一年所有的合同列表
 	pars = make([]interface{}, 0)
-	condition = " AND company_id = ? AND company_contract_id < ?   AND status = 1    AND product_id = ?  ORDER BY company_contract_id DESC   LIMIT  1  "
-	pars = append(pars, detail.CompanyId, companyContractId, detail.ProductId)
-	detailPrevious, e := company.GetCompanyContracDetail(condition, pars)
+	condition = " AND company_id = ? AND company_contract_id < ?   AND status = 1    AND product_id = ? AND  start_date >= ? AND  start_date <= ?  "
+	pars = append(pars, detail.CompanyId, companyContractId, detail.ProductId, lastYearStartData, lastYearEndData)
+	companyContracList, e := company.GetCompanyContracList(condition, pars)
 	if e != nil {
-		err = errors.New("GetCompanyContracDetail,detailPrevious Err: " + e.Error())
+		err = errors.New("GetCompanyContracList Err: " + e.Error())
 		return
 	}
-	var packageDifference string
 
-	if detail.Money > detailPrevious.Money {
+	var sumMoney float64
+	var packageDifference string
+	for _, v := range companyContracList {
+		sumMoney += v.Money
+	}
+	if detail.Money > sumMoney {
 		packageDifference = "增加套餐"
-	} else if detail.Money < detailPrevious.Money {
+	} else if detail.Money < sumMoney {
 		packageDifference = "减少套餐"
 	} else {
 		packageDifference = "维持套餐"
 	}
-
+	//fmt.Println(packageDifference)
+	//return
 	e = company.UpdateCompanyContractPackageDifference(packageDifference, companyContractId)
 	if e != nil {
 		err = errors.New("UpdateCompanyContractPackageDifference, Err: " + e.Error())

+ 20 - 0
services/cygx/industrial_management.go

@@ -129,3 +129,23 @@ func AddUserIndustryFllowByNewId(industrialManagementId int) (err error) {
 	//}
 	return
 }
+
+// 处理产业管理时间线相关内容的数据
+func UpdateIndustrialManagementTimeLineDateList3ByRedis(industrialManagementId int) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			msg := fmt.Sprint("industrialManagementId:", industrialManagementId)
+			go alarm_msg.SendAlarmMsg("处理产业管理时间线相关内容的数据,写入Redis队列消息失败: UpdateIndustrialManagementTimeLineDateList3ByRedis"+err.Error()+msg, 2)
+		}
+	}()
+	//SourceType int       `description:"1:报名、 2:取消报名、3:活动编辑、4:活动发布,取消发布、5:活动到会。"`
+	log := &cygx.IndustrialManagementDelte{IndustrialManagementId: industrialManagementId}
+	if utils.Re == nil {
+		err := utils.Rc.LPush(utils.CYGX_ARTICLE_TIME_LINE_KEY, log)
+		if err != nil {
+			fmt.Println("UpdateIndustrialManagementTimeLineDateList3ByRedis LPush Err:" + err.Error())
+		}
+	}
+	return
+}

+ 0 - 2
services/cygx/mail.go

@@ -19,7 +19,6 @@ func SendResearchSummaryEmail(detail *cygx.DetailCygxResearchSummaryRep, touser
 	m.SetHeader("From", "hzcygx@hzinsights.com ")
 	//m.SetHeader("To", touser...)
 	var user []string
-	user = append(user, "zwxi@hzinsights.com ")
 	user = append(user, "zqliu@hzinsights.com ")
 	user = append(user, "tshen@hzinsights.com ")
 	user = append(user, "hdong@hzinsights.com ")
@@ -288,7 +287,6 @@ func SendMinutesSummaryEmail(detail *cygx.DetailCygxMinutesSummaryRep, touser []
 	m.SetHeader("From", "hzcygx@hzinsights.com ")
 	//m.SetHeader("To", touser...)
 	var user []string
-	user = append(user, "zwxi@hzinsights.com ")
 	user = append(user, "zqliu@hzinsights.com ")
 	user = append(user, "tshen@hzinsights.com ")
 	user = append(user, "hdong@hzinsights.com ")

+ 3 - 2
utils/constants.go

@@ -34,7 +34,7 @@ const (
 
 const (
 	APPNAME          = "弘则-CRM管理后台"
-	EmailSendToUsers = "glji@hzinsights.com;pyan@hzinsights.com;cxzhang@hzinsights.com;zwxi@hzinsights.com;hsun@hzinsights.com"
+	EmailSendToUsers = "glji@hzinsights.com;pyan@hzinsights.com;cxzhang@hzinsights.com;hsun@hzinsights.com"
 )
 
 // 手机号,电子邮箱正则
@@ -424,7 +424,8 @@ const (
 	CHART_PERMISSION_NAME_45W                      = "45w大套餐" // 权益45w大套餐名称
 	CHART_PERMISSION_ID_45W                        = 2002     // 权益45w大套餐表示的权限ID(自定义)
 	HONG_GUAN_NAME                          string = "宏观"
-	WX_USER_RAI_LABEL_KEY                          = "WX_USER_RAI_LABEL_KEY" //用户列表标签key
+	CYGX_ARTICLE_TIME_LINE_KEY                     = "CYGX_ARTICLE_TIME_LINE_KEY" //产业时间线关联的文章key
+	WX_USER_RAI_LABEL_KEY                          = "WX_USER_RAI_LABEL_KEY"      //用户列表标签key
 )
 
 // 权益cygx_config配置主键以后放这里