八月四号的两个需求池

controllers/activity.go

@@ -3434,53 +3434,55 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 
 	//userType = 1
 	//查询专项产业调研展示权限
-	var condition string
-	condition = ` AND art.publish_status = 1  AND art.label != '' `
-	if isPower == 1 {
-		condition += permissionSqlStr
-	}
-	//行业名称
-	if len(chartPermissionIds) > 0 {
-		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-	}
-	var conditionOr string
+	if whichDay == "" {
+		var condition string
+		condition = ` AND art.publish_status = 1  AND art.label != '' `
+		if isPower == 1 {
+			condition += permissionSqlStr
+		}
+		//行业名称
+		if len(chartPermissionIds) > 0 {
+			condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
+		}
+		var conditionOr string
 
-	if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-		conditionOr += ` OR (1=1 AND   art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-	}
-	if (userType == 5) && strings.Contains(permissionStr, "专家") {
-		conditionOr += ` OR (1=1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-	}
-	if userType == 1 {
-		conditionOr += ` OR (1=1 ` + condition + permissionSqlStr + `) `
-	}
+		if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
+			conditionOr += ` OR (1=1 AND   art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
+		}
+		if (userType == 5) && strings.Contains(permissionStr, "专家") {
+			conditionOr += ` OR (1=1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
+		}
+		if userType == 1 {
+			conditionOr += ` OR (1=1 ` + condition + permissionSqlStr + `) `
+		}
 
-	if companyProduct != nil {
-		if companyProduct.Scale != "" {
-			conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+		if companyProduct != nil {
+			if companyProduct.Scale != "" {
+				conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+			}
 		}
-	}
 
-	condition += sqlExport + conditionOr
-	specialList, err := models.GetActivityLabelSpecialListAll(condition, pars, startSize, 8)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	for k2, v2 := range specialList {
-		specialList[k2].KeyWord = services.LabelStrV5(v2.KeyWord, v2.IsShowSubjectName)
-		specialList[k2].ImgUrlBg = "https://hzstatic.hzinsights.com/static/temp/20220426202204/20220426/XDLLsjC9XAAy8LIzQr7GsjrBbtX6.png"
-	}
+		condition += sqlExport + conditionOr
+		specialList, err := models.GetActivityLabelSpecialListAll(condition, pars, startSize, 8)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败，Err:" + err.Error()
+			return
+		}
+		for k2, v2 := range specialList {
+			specialList[k2].KeyWord = services.LabelStrV5(v2.KeyWord, v2.IsShowSubjectName)
+			specialList[k2].ImgUrlBg = "https://hzstatic.hzinsights.com/static/temp/20220426202204/20220426/XDLLsjC9XAAy8LIzQr7GsjrBbtX6.png"
+		}
 
-	itemList := new(models.ActivityTypeHome)
-	itemList.ActivityTypeName = "专项产业调研"
-	itemList.Resource = 2
-	itemList.List = specialList
-	itemList.ActivityTypeId = 7
-	itemList.ImgUrl = "https://hzstatic.hzinsights.com/static/temp/20220427202204/20220427/b2Bj3fGakP16iJRFKisQohCWnCNl.png"
-	itemList.ImgUrlBg = "https://hzstatic.hzinsights.com/static/temp/20220427202204/20220427/OkunjfKEgo5KRLifzwwLX8cDZnnN.png"
-	list = append(list, itemList)
+		itemList := new(models.ActivityTypeHome)
+		itemList.ActivityTypeName = "专项产业调研"
+		itemList.Resource = 2
+		itemList.List = specialList
+		itemList.ActivityTypeId = 7
+		itemList.ImgUrl = "https://hzstatic.hzinsights.com/static/temp/20220427202204/20220427/b2Bj3fGakP16iJRFKisQohCWnCNl.png"
+		itemList.ImgUrlBg = "https://hzstatic.hzinsights.com/static/temp/20220427202204/20220427/OkunjfKEgo5KRLifzwwLX8cDZnnN.png"
+		list = append(list, itemList)
+	}
 	//获取对应活动的数量并排序
 	intArr := make([]int, 0)
 	var items []*models.ActivityTypeHome
@@ -4486,54 +4488,56 @@ func (this *ActivityCoAntroller) LabelTypeListV6Pc() {
 		list[k].Resource = 1
 	}
 
-	//查询专项产业调研展示权限
-	var condition string
-	condition = ` AND art.publish_status = 1  AND art.label != '' `
-	if isPower == 1 {
-		condition += permissionSqlStr
-	}
-	//行业名称
-	if len(chartPermissionIds) > 0 {
-		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
-	}
-	var conditionOr string
+	if whichDay == "" {
+		//查询专项产业调研展示权限
+		var condition string
+		condition = ` AND art.publish_status = 1  AND art.label != '' `
+		if isPower == 1 {
+			condition += permissionSqlStr
+		}
+		//行业名称
+		if len(chartPermissionIds) > 0 {
+			condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
+		}
+		var conditionOr string
 
-	if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
-		conditionOr += ` OR (1=1 AND   art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
-	}
-	if (userType == 5) && strings.Contains(permissionStr, "专家") {
-		conditionOr += ` OR (1=1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
-	}
-	if userType == 1 {
-		conditionOr += ` OR (1=1 ` + condition + permissionSqlStr + `) `
-	}
+		if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
+			conditionOr += ` OR (1=1 AND   art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
+		}
+		if (userType == 5) && strings.Contains(permissionStr, "专家") {
+			conditionOr += ` OR (1=1 AND art.customer_type_ids LIKE '%5%'	 ` + condition + `) `
+		}
+		if userType == 1 {
+			conditionOr += ` OR (1=1 ` + condition + permissionSqlStr + `) `
+		}
 
-	if companyProduct != nil {
-		if companyProduct.Scale != "" {
-			conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+		if companyProduct != nil {
+			if companyProduct.Scale != "" {
+				conditionOr += ` OR (  art.scale LIKE '%` + companyProduct.Scale + `%'	 ` + condition + `) `
+			}
 		}
-	}
 
-	condition += sqlExport + conditionOr
-	specialList, err := models.GetActivityLabelSpecialListAll(condition, pars, startSize, 8)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	for k2, v2 := range specialList {
-		specialList[k2].KeyWord = services.LabelStrV5(v2.KeyWord, v2.IsShowSubjectName)
-		specialList[k2].Resource = 2
-	}
+		condition += sqlExport + conditionOr
+		specialList, err := models.GetActivityLabelSpecialListAll(condition, pars, startSize, 8)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败，Err:" + err.Error()
+			return
+		}
+		for k2, v2 := range specialList {
+			specialList[k2].KeyWord = services.LabelStrV5(v2.KeyWord, v2.IsShowSubjectName)
+			specialList[k2].Resource = 2
+		}
 
-	itemList := new(models.ActivityTypeHomePc)
-	itemList.ActivityTypeName = "专项产业调研"
-	itemList.Resource = 2
-	itemList.List = specialList
-	itemList.ActivityTypeId = 7
-	itemList.OnlineIco = "https://hzstatic.hzinsights.com/static/temp/20220707202207/20220707/0H4md6VgZMuIttggMUnJxgrlayxC.png"
-	itemList.ImgUrlBgPc = "https://hzstatic.hzinsights.com/static/temp/20220707202207/20220707/rFwAM1c4fIMJM0EGoUkUYl25XH9L.png"
-	list = append(list, itemList)
+		itemList := new(models.ActivityTypeHomePc)
+		itemList.ActivityTypeName = "专项产业调研"
+		itemList.Resource = 2
+		itemList.List = specialList
+		itemList.ActivityTypeId = 7
+		itemList.OnlineIco = "https://hzstatic.hzinsights.com/static/temp/20220707202207/20220707/0H4md6VgZMuIttggMUnJxgrlayxC.png"
+		itemList.ImgUrlBgPc = "https://hzstatic.hzinsights.com/static/temp/20220707202207/20220707/rFwAM1c4fIMJM0EGoUkUYl25XH9L.png"
+		list = append(list, itemList)
+	}
 	//记录用户搜索的筛选条件
 	item := new(models.CygxActivitySearchHistory)
 	item.UserId = user.UserId

services/article.go

@@ -1276,7 +1276,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 		industryName = reportMapDetail.SubCategoryName
 	}
 	keyword2 := articleInfo.Title
-	keyword3 := articleInfo.PublishDate
+	keyword3 := time.Now().Format(utils.FormatDateTime)
 	keyword4 := articleInfo.Abstract
 	mapAlreadySend := make(map[int]int)
 	//如果是策略就按照策略的推送方式来写
@@ -1322,7 +1322,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 							return err
 						}
 						for _, item := range openIdLists {
-							first := "您预约的调研，有关联的纪要发布/更新了1"
+							first := "您预约的调研，有关联的纪要发布/更新了"
 							keyword1 := industryName
 							openIditem := new(models.OpenIdList)
 							openIditem.OpenId = item.OpenId
@@ -1414,7 +1414,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 							return err
 						}
 						for _, item := range openIdLists {
-							first := "您预约的调研，有关联的纪要发布/更新了1"
+							first := "您预约的调研，有关联的纪要发布/更新了"
 							keyword1 := industryName
 							openIditem := new(models.OpenIdList)
 							openIditem.OpenId = item.OpenId