Merge branch 'mfyx_3.6' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -465,29 +465,32 @@ func (this *ActivityCoAntroller) Detail() {
 		//处理音频回放
 		var mapActivityId []int
 		mapActivityId = append(mapActivityId, activityId)
-		mapActivityVoice, err := services.GetActivityVoiceResp(mapActivityId)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "GetActivityVoiceResp，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
-			return
-		}
-		if mapActivityVoice[activityId] != nil {
-			activityInfo.FileType = 1
-			activityInfo.AudioLink = true
-			activityInfo.VoiceList = mapActivityVoice[activityId]
-		}
 
-		//处理视频回放
-		mapActivityVideo, err := services.GetActivityVideoResp(mapActivityId)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "GetActivityVideoResp，Err:" + err.Error()
-			return
-		}
-		if mapActivityVideo[activityId] != nil {
-			activityInfo.FileType = 2
-			activityInfo.AudioLink = true
-			activityInfo.VideoDetail = mapActivityVideo[activityId]
+		if activityInfo.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN { // 研选的音视频不在查研展示
+			mapActivityVoice, err := services.GetActivityVoiceResp(mapActivityId)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "GetActivityVoiceResp，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
+				return
+			}
+			if mapActivityVoice[activityId] != nil {
+				activityInfo.FileType = 1
+				activityInfo.AudioLink = true
+				activityInfo.VoiceList = mapActivityVoice[activityId]
+			}
+
+			//处理视频回放
+			mapActivityVideo, err := services.GetActivityVideoResp(mapActivityId)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "GetActivityVideoResp，Err:" + err.Error()
+				return
+			}
+			if mapActivityVideo[activityId] != nil {
+				activityInfo.FileType = 2
+				activityInfo.AudioLink = true
+				activityInfo.VideoDetail = mapActivityVideo[activityId]
+			}
 		}
 		//8.5 小程序活动详情页 除专家电话外 其余属于新产业的活动 ，不显示 new 标签
 		if activityInfo.ActivityTypeName != "专家电话会" {

controllers/home.go

@@ -671,7 +671,7 @@ func (this *HomeController) NewList() {
 	//	condition += `  AND IF ( source = 'activity' , source_id  NOT IN (` + utils.GetOrmInReplace(lenyiDongactivityIds) + `) ,1=1 ) `
 	//	pars = append(pars, yiDongactivityIds)
 	//} else {
-	condition += ` AND source NOT IN ('activity','activityspecial','newchart','industrialsourceHz','industrialsourceYx') ` + conditionInit
+	condition += ` AND source NOT IN ('activity','activityspecial','newchart','industrialsourceHz','industrialsourceYx')   AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 )  ` + conditionInit
 	//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
 	conditionActivity, err := services.ActivityConditioninitSql(user, "", 0)
 	if err != nil && err.Error() != utils.ErrNoRow() {

models/rai_serve/rai_serve_company.go

@@ -116,6 +116,25 @@ func UpdateCygxRaiServeCompanyFormalNoMulti(items []*CygxRaiServeCompany) (err e
 	return
 }
 
+// UpdateCygxRaiServeCompanyFormalNoContractMulti 批量修改非正式，且没有签约过合同的客户信息
+func UpdateCygxRaiServeCompanyFormalNoContractMulti(items []*CygxRaiServeCompany) (err error) {
+	o := orm.NewOrm()
+	p, err := o.Raw("UPDATE cygx_rai_serve_company SET serve_coverage_rate =?  ,is_user_maker = ?    WHERE company_id = ?").Prepare()
+	if err != nil {
+		return
+	}
+	defer func() {
+		_ = p.Close() // 别忘记关闭 statement
+	}()
+	for _, v := range items {
+		_, err = p.Exec(v.ServeCoverageRate, v.IsUserMaker, v.CompanyId)
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
 // 获取当前所属权益服务公司表所有ID
 func GetCygxRaiServeCompanyAllList() (items []*CygxRaiServeCompany, err error) {
 	o := orm.NewOrm()

services/es_comprehensive.go

@@ -1556,7 +1556,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	keyWord = "%" + keyWord + "%"
 	var conditionTitle string
 	var parsTitle []interface{}
-	conditionTitle = " AND search_title LIKE ? "
+	conditionTitle = " AND search_title LIKE ? AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
 	parsTitle = append(parsTitle, keyWord)
 	totalTitle, e := models.GetResourceDataCount(conditionTitle, parsTitle)
 	if e != nil {
@@ -1567,7 +1567,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	var conditionContent string
 	var parsContent []interface{}
 
-	conditionContent = " AND search_content LIKE ? AND search_title  NOT LIKE ?  "
+	conditionContent = " AND search_content LIKE ? AND search_title  NOT LIKE ?  AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
 	parsContent = append(parsContent, keyWord, keyWord)
 	totalContent, e := models.GetResourceDataCount(conditionContent, parsContent)
 	if e != nil {
@@ -1577,11 +1577,10 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	var searchTotal int
 	searchTotal = (startSize/pageSize + 1) * pageSize
 	var list []*models.CygxResourceData
-	fmt.Println("totalTitle", totalTitle)
-	fmt.Println("totalContent", totalContent)
-	fmt.Println(searchTotal)
+	//fmt.Println("totalTitle", totalTitle)
+	//fmt.Println("totalContent", totalContent)
+	//fmt.Println(searchTotal)
 	if totalTitle >= searchTotal {
-		fmt.Println("1")
 		//全部都是标题搜索
 		list, e = models.GetResourceDataListCondition(conditionTitle, parsTitle, startSize, pageSize)
 		if e != nil && e.Error() != utils.ErrNoRow() {
@@ -1589,7 +1588,6 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 			return
 		}
 	} else if totalTitle <= searchTotal-pageSize {
-		fmt.Println("2")
 		//全部都是内容搜索
 		startSize = startSize - totalTitle
 
@@ -1599,9 +1597,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 			return
 		}
 	} else {
-		fmt.Println("3")
 		//一半标题搜索，一半内容搜索
-
 		list, e = models.GetResourceDataListCondition(conditionTitle, parsTitle, startSize, pageSize)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetResourceDataListCondition, Err: " + e.Error())

services/micro_roadshow.go

@@ -384,10 +384,10 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 		conditionAskserie += ` AND a.chart_permission_id IN (` + chartPermissionIds + `)`
 	}
 	//发布状态
-	audioAct += ` AND  b.publish_status = 1 `
-	videoAct += ` AND  b.publish_status = 1 `
-	videoMico += ` AND  a.publish_status = 1 `
-	conditionAskserie += ` AND  a.publish_status = 1 `
+	audioAct += ` AND  b.publish_status = 1 AND  b.chart_permission_id  != 31 `
+	videoAct += ` AND  b.publish_status = 1  AND  b.chart_permission_id  != 31 `
+	videoMico += ` AND  a.publish_status = 1 AND  a.chart_permission_id  != 31 `
+	conditionAskserie += ` AND  a.publish_status = 1  AND  a.chart_permission_id  != 31 `
 
 	total, videoList, e = models.GetMicroRoadShowVideoPageListV12(startSize, pageSize, audioAct, audioActPars, videoAct, videoActPars, videoMico, videoMicoPars, conditionAskserie, askseriePars)
 	if e != nil {

services/rai_serve_count.go

@@ -1287,9 +1287,11 @@ func UpdateWeekAvg() (err error) {
 		return
 	}
 
-	//非正式客户数据修改
-	var itemsUpdateFormalNo []*rai_serve.CygxRaiServeCompany
-	if len(formalNoCompanyIds) > 0 { //非正式客户信息
+	var itemsUpdateFormalNo []*rai_serve.CygxRaiServeCompany         //非正式客户数据修改
+	var itemsUpdateFormalNoContract []*rai_serve.CygxRaiServeCompany //非正式客户没有合同的客户修改
+
+	mapContractCompanyIds := make(map[int]bool) //签过合同的试用客户ID
+	if len(formalNoCompanyIds) > 0 {            //非正式客户信息
 		condition = ""
 		pars = make([]interface{}, 0)
 		condition = `    AND product_id = 2 AND company_id IN  (` + utils.GetOrmInReplace(len(formalNoCompanyIds)) + `) AND status = 1  AND  end_date < ?  GROUP BY	company_id  ORDER BY	company_contract_id DESC `
@@ -1331,6 +1333,22 @@ func UpdateWeekAvg() (err error) {
 			}
 			item.PermissionName = permissionNameMapByContractId[v.CompanyContractId]
 			itemsUpdateFormalNo = append(itemsUpdateFormalNo, item)
+			mapContractCompanyIds[v.CompanyId] = true
+		}
+
+		for _, v := range formalNoCompanyIds {
+			if mapContractCompanyIds[v] {
+				continue
+			}
+			fmt.Println(v)
+			item := new(rai_serve.CygxRaiServeCompany)
+			item.CompanyId = v
+
+			item.ServeCoverageRate = utils.SubFloatToString(mapWeekServeCount[v]/4, 2)
+			if mapWeekIsKp[v] {
+				item.IsUserMaker = 1
+			}
+			itemsUpdateFormalNoContract = append(itemsUpdateFormalNoContract, item)
 		}
 	}
 	e = rai_serve.UpdateCygxRaiServeCompanyFormalNoMulti(itemsUpdateFormalNo)
@@ -1338,6 +1356,12 @@ func UpdateWeekAvg() (err error) {
 		err = errors.New("UpdateCygxRaiServeCompanyFormalNoMulti, Err: " + e.Error())
 		return
 	}
+
+	e = rai_serve.UpdateCygxRaiServeCompanyFormalNoContractMulti(itemsUpdateFormalNoContract)
+	if e != nil {
+		err = errors.New("UpdateCygxRaiServeCompanyFormalNoMulti, Err: " + e.Error())
+		return
+	}
 	fmt.Println(" UpdateWeekAvg  end")
 	return
 }

services/resource_data.go

@@ -643,6 +643,9 @@ func UpdateArticleResourceData(sourceId int) {
 			item.SearchTag = detail.ArticleTypeName // 研选类型名称
 		} else {
 			item.SearchTag = detail.MatchTypeName
+			if detail.SubCategoryName == "产业跟踪" && detail.MatchTypeName == "行业深度" { //需求池973：查研观向首页标签【深度】下，过滤【产业跟踪】系列的报告。新报告不再写入此标签下，存量报告也去掉
+				item.SearchTag = ""
+			}
 			//获取文章分类详情
 			detailCategory, _ := models.GetCygxReportMappingCelueMaxDetailByCategoryId(detail.CategoryId)
 			if detailCategory != nil {

utils/config.go

@@ -196,7 +196,7 @@ func init() {
 		EmailTechnology = "mlluo@hzinsights.com;jxu@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;hwang@hzinsights.com;rli@hzinsights.com"       //科技行业专家邮箱
 		EmailMedicine = "xlzheng@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;yxyan@hzinsights.com;ppwang@hzinsights.com"                       //医药行业专家邮箱
 		EmailConsumption = "yrhuang@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jxu@hzinsights.com;hychen@hzinsights.com;lwang@hzinsights.com" //消费行业专家邮箱
-		EmailZhizao = "xfma@hzinsights.com;myyang@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                                 //智造行业专家邮箱
+		EmailZhizao = "xfma@hzinsights.com;tkding@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                                 //智造行业专家邮箱
 		EmailStrategy = "experts@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                                                  //策略行业专家邮箱
 		EmailExpert = "experts@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                                                    //研选行业专家邮箱
 		EmaiWhiteUserList = "tshen@hzinsights.com;cxzhang@hzinsights.com;yyli@hzinsights.com"                                                                 //白名单邮箱