Merge branch 'cygx/cygx_13.2' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/statistic_company_merge.go

@@ -804,7 +804,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPermissionList() {
 	//}
 
 	//if permissionName == "" {
-	condition += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','买方研选')`
+	condition += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','研选订阅','研选扣点包')`
 	//}
 
 	var err error
@@ -826,7 +826,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPermissionList() {
 		if dataType == "行业新签" {
 			conditionPerssion := condition1
 			parsPerssion := pars1
-			conditionPerssion += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','买方研选')`
+			conditionPerssion += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','研选订阅','研选扣点包')`
 
 			listPessionGroup, err = models.GetCompanyContractPermissionNameGroupCount(conditionPerssion, parsPerssion)
 			if err != nil && err.Error() != utils.ErrNoRow() {
@@ -883,7 +883,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPermissionList() {
 		if dataType == "行业续约" {
 			conditionPerssion := condition1
 			parsPerssion := pars1
-			conditionPerssion += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','买方研选')`
+			conditionPerssion += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','研选订阅','研选扣点包')`
 
 			listPessionGroup, err = models.GetCompanyContractPermissionNameGroupCount(conditionPerssion, parsPerssion)
 			if err != nil && err.Error() != utils.ErrNoRow() {
@@ -942,7 +942,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPermissionList() {
 		if dataType == "行业未续约" {
 			conditionPerssion := condition1
 			parsPerssion := pars1
-			conditionPerssion += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','买方研选')`
+			conditionPerssion += ` AND  d.permission_name IN ('医药','消费','科技','智造','策略','研选订阅','研选扣点包')`
 
 			listPessionGroup, err = models.GetCompanyContractPermissionNameGroupCount(conditionPerssion, parsPerssion)
 			if err != nil && err.Error() != utils.ErrNoRow() {
@@ -1025,7 +1025,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPermissionList() {
 	}
 
 	//处理展示顺序
-	permissionNameSlice := []string{"医药", "消费", "科技", "智造", "策略", "买方研选"}
+	permissionNameSlice := []string{"医药", "消费", "科技", "智造", "策略", utils.CHART_PERMISSION_NAME_MF_YANXUAN, utils.YAN_XUAN_KOU_DIAN_BAO_NAME}
 	var itemspermissionNameSlice []*models.CompanyContractPermissionNameGroupCountResp
 	for _, vName := range permissionNameSlice {
 		item := new(models.CompanyContractPermissionNameGroupCountResp)