纪要库首页展示样式，关联字段

controllers/chart_permission.go

@@ -19,19 +19,63 @@ type ChartPermissionAuthController struct {
 // @Description 获取用户详情接口
 // @Success 200 {object} models.ChartPermissionResp
 // @router /all [get]
-func (this *ChartPermissionController) Detail() {
+func (this *ChartPermissionAuthController) Detail() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	list, err := models.GetChartPermissionAll()
+	user := this.User
+	if user == nil {
+		br.Msg = "请重新登录"
+		br.Ret = 408
+		return
+	}
+	var condition string
+	var userType int
+	if user.CompanyId > 1 {
+		total, err := models.GetCountCompanyDetailByIdGroup(user.CompanyId)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败，Err:" + err.Error()
+			return
+		}
+		if total == 0 {
+			userType = 0
+		} else {
+			companyDetail, err := models.GetCompanyDetailByIdGroup(user.CompanyId)
+			if err != nil {
+				br.Msg = "获取信息失败！"
+				br.ErrMsg = "获取客户详情失败，Err:" + err.Error()
+				return
+			}
+			if companyDetail.Status == "永续" {
+				userType = 1
+			}
+		}
+	}
+	if userType == 1 {
+		condition += ` AND permission_name  != '研选'`
+	}
+	list, err := models.GetChartPermissionAll(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
 	resp := new(models.ChartPermissionResp)
+	for k, v := range list {
+		if userType == 1 {
+			if v.PermissionName != "研选" {
+				resp.List = append(resp.List, v)
+			}
+		} else {
+			resp.List = append(resp.List, v)
+		}
+		if services.GetShowSustainable() && v.PermissionName == "研选" {
+			resp.List[k].IsShowSustainable = true
+		}
+	}
 	resp.List = list
 	br.Ret = 200
 	br.Success = true

controllers/home.go

@@ -1,11 +1,11 @@
 package controllers
 
 import (
-	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"
 	"hongze/hongze_cygx/utils"
 	"rdluck_tools/paging"
+	"strings"
 )
 
 type HomeController struct {
@@ -58,28 +58,15 @@ func (this *HomeController) ListHome() {
 			return
 		}
 		page = paging.GetPaging(currentIndex, pageSize, total)
-		//if categoryId == "" {
-		//	list := make([]*models.HomeArticle, 0)
-		//	resp.List = list
-		//	resp.Paging = page
-		//	br.Ret = 200
-		//	br.Success = true
-		//	br.Msg = "获取成功"
-		//	br.Data = resp
-		//	return
-		//}
-
 		if categoryId != "" {
 			condition += ` AND category_id IN(` + categoryId + `)`
-			condition += ` OR ( category_name = '` + categoryinfo.PermissionName + `' AND publish_status = 1 AND is_summary = 1 )`
+			condition += ` OR ( category_name  LIKE '%` + categoryinfo.PermissionName + `%' AND publish_status = 1 AND is_summary = 1 )`
 		} else {
-			condition += ` AND  category_name = '` + categoryinfo.PermissionName + `'`
+			condition += ` AND  category_name   LIKE '%` + categoryinfo.PermissionName + `%'`
 		}
 
 	}
-
 	//condition = ` AND a.category_id NOT IN (85,71) `
-	fmt.Println(condition)
 	total, err := models.GetHomeCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -97,6 +84,10 @@ func (this *HomeController) ListHome() {
 	for i := 0; i < lenList; i++ {
 		item := list[i]
 		list[i].Body, _ = services.GetReportContentTextSub(item.Body)
+		list[i].PublishDate = utils.StrTimeToTime(item.PublishDate).Format(utils.FormatDateTimeNoSecond) //时间字符串格式转时间格式
+		if strings.Contains(item.CategoryName, "研选") {
+			list[i].IsResearch = true
+		}
 	}
 	resp.List = list
 	resp.Paging = page

models/article.go

@@ -79,6 +79,8 @@ type HomeArticle struct {
 	CategoryName     string `description:"一级分类"`
 	SubCategoryName  string `description:"二级分类"`
 	ExpertBackground string `description:"专家背景"`
+	IsResearch       bool   `description:"是否属于研选"`
+	Pv               int    `description:"PV"`
 }
 
 type ArticleDetail struct {

models/chart_permission.go

@@ -18,9 +18,9 @@ type ChartPermissionResp struct {
 	List []*ChartPermission
 }
 
-func GetChartPermissionAll() (items []*ChartPermission, err error) {
+func GetChartPermissionAll(condition string) (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 ORDER BY sort ASC `
+	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 ` + condition + ` ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

models/home.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"fmt"
 	"rdluck_tools/orm"
 	"rdluck_tools/paging"
 )
@@ -20,14 +19,13 @@ func GetHomeCount(condition string, pars []interface{}) (count int, err error) {
 
 func GetHomeList(condition string, pars []interface{}, startSize, pageSize int) (items []*HomeArticle, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT *
+	sql := ` SELECT * ,(SELECT count(1) FROM cygx_article_history_record as h WHERE h.article_id = a.article_id ) as pv
                  FROM cygx_article AS a
                 WHERE a.publish_status=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY publish_date DESC,article_id DESC LIMIT ?,? `
-	fmt.Println(sql)
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

services/task.go

@@ -18,19 +18,11 @@ func Task() {
 	fmt.Println("start")
 	//同步数据
 	if utils.RunMode == "release" {
-		//syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)
-		//toolbox.AddTask("syncTacticsList", syncTacticsList)
-		//toolbox.StartTask()
-		syncTacticsListAddreport := task.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport)
+		syncTacticsListAddreport := task.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport) //同步文章
 		task.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
-
 		//同步纪要库中的Es
-		//syncTacticsListToEs := toolbox.NewTask("syncTacticsListToEs", "0 */30 * * * *", SyncTacticsListToEs)
-		//toolbox.AddTask("syncTacticsListToEs", syncTacticsListToEs)
 		getSummarytoEs := task.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
 		task.AddTask("getSummarytoEs", getSummarytoEs)
-
-		//toolbox.StartTask()
 	}
 
 	//UpdateActivitySattus()
@@ -52,7 +44,7 @@ func Task() {
 	task.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
 
 	////白名单发送
-	//sendEmailUserWhiteList := task.NewTask("sendEmailUserWhiteList", "0 27 17 * * *", SendEmailUserWhiteList) //预约外呼名单，会前1小时自动发送邮件给专家组
+	//sendEmailUserWhiteList := task.NewTask("sendEmailUserWhiteList", "0 27 17 * * *", SendEmailUserWhiteList) //白名单发送
 	//task.AddTask("sendEmailUserWhiteList", sendEmailUserWhiteList)
 
 	//白名单发送2

utils/constants.go

@@ -6,16 +6,17 @@ const (
 
 //常量定义
 const (
-	FormatTime            = "15:04:05"                //时间格式
-	FormatDate            = "2006-01-02"              //日期格式
-	FormatDateTime        = "2006-01-02 15:04:05"     //完整时间格式
-	HlbFormatDateTime     = "2006-01-02_15:04:05.999" //完整时间格式
-	FormatDateTimeUnSpace = "20060102150405"          //完整时间格式
-	PageSize15            = 15                        //列表页每页数据量
-	PageSize5             = 5
-	PageSize10            = 10
-	PageSize20            = 20
-	PageSize30            = 30
+	FormatTime             = "15:04:05"                //时间格式
+	FormatDate             = "2006-01-02"              //日期格式
+	FormatDateTime         = "2006-01-02 15:04:05"     //完整时间格式
+	HlbFormatDateTime      = "2006-01-02_15:04:05.999" //完整时间格式
+	FormatDateTimeNoSecond = "2006-01-02 15:04"        //完整时间格式
+	FormatDateTimeUnSpace  = "20060102150405"          //完整时间格式
+	PageSize15             = 15                        //列表页每页数据量
+	PageSize5              = 5
+	PageSize10             = 10
+	PageSize20             = 20
+	PageSize30             = 30
 )
 
 const (