xingzai 2 anos atrás
pai
commit
c5d72f3b57
3 arquivos alterados com 7 adições e 3 exclusões
  1. 3 1
      controllers/activity.go
  2. 3 1
      controllers/home.go
  3. 1 1
      models/activity_voice.go

+ 3 - 1
controllers/activity.go

@@ -473,7 +473,9 @@ func (this *ActivityController) Detail() {
 					if mapIndustrial[v.IndustrialManagementId] > 0 && !industrialList[k].IsResearch {
 						industrialList[k].IsJump = true
 					}
-					industrialList[k].IndustryNewLabel = industryNewMap[v.IndustrialManagementId]
+					if activityInfo.ActivityTypeId == 1 {
+						industrialList[k].IndustryNewLabel = industryNewMap[v.IndustrialManagementId]
+					}
 				}
 			}
 		}

+ 3 - 1
controllers/home.go

@@ -7,6 +7,7 @@ import (
 	"hongze/hongze_clpt/utils"
 	"strconv"
 	"strings"
+	"time"
 )
 
 type HomeController struct {
@@ -279,7 +280,8 @@ func (this *MobileHomeController) NewList() {
 	resp := new(models.HomeResourceDataListResp)
 
 	//condition += " AND source = 'activityvoice' "
-
+	condition += " AND publish_date  < ? "
+	pars = append(pars, time.Now().AddDate(0, 0, 30))
 	total, err := models.GetResourceDataCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"

+ 1 - 1
models/activity_voice.go

@@ -93,7 +93,7 @@ func GetActivityVoiceListAll(condition string, pars []interface{}, startSize, pa
 func GetActivityVoiceList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVoiceResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-	v.*,art.chart_permission_id
+	v.*,art.chart_permission_id,art.chart_permission_name
 FROM
 	cygx_activity_voice AS v 
 	INNER JOIN cygx_activity as art ON art.activity_id = v.activity_id    WHERE 1= 1  `