最新页面本周研究汇总周度研究汇总

controllers/report.go

@@ -1420,6 +1420,7 @@ func (this *ReportController) IsShow() {
 	resp.ActivitySpecialExplain = utils.ACTIVITY_SPECIAL_EXPLAIN
 	//resp.YanXuan_Explain = true
 	resp.IsShowFreeButton = IsShowFreeButton
+	resp.IsBelongRai = services.GetBelongingRai(user.Mobile)
 	//mobile := user.Mobile
 	//if mobile == "" {
 	//	br.Ret = 200

models/admin.go

@@ -60,3 +60,21 @@ func GetSysAdminById(adminId int) (item *Admin, err error) {
 	err = o.Raw(sql, adminId).QueryRow(&item)
 	return
 }
+
+// 获取权益内部人员手机号
+func GetRaiAdmin() (items []*AdminMobileResp, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT
+	mobile
+FROM
+	admin 
+WHERE
+	role_type_code LIKE '%rai%' 
+	AND group_id NOT IN ( 19, 10 ) 
+	AND enabled = 1 
+	OR (
+	department_name = '产品技术部' 
+	AND enabled = 1) `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}

models/report.go

@@ -264,6 +264,7 @@ type IsShow struct {
 	YanXuan_Explain        bool      `description:"研选说明"`
 	ActivitySpecialExplain string    `description:"专项调研活动"`
 	SearchTxtList          SearchTxt `description:"搜索栏回显内容说明"`
+	IsBelongRai            bool      `description:"是否属于权益内部人员"`
 }
 
 type SearchTxt struct {

models/report_selection.go

@@ -128,6 +128,18 @@ func GetReportSelectionListPublic(condition, readSql, tbdb string, pars []interf
 	return
 }
 
+// 列表
+func GetReportSelectionListHome(condition, tbdb string, pars []interface{}, startSize, pageSize int) (items []*CygxReportSelectionRep, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT *  FROM  ` + tbdb + ` as art WHERE 1= 1 AND art.publish_status = 1  `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY  art.publish_date  DESC  LIMIT ?,?`
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
 type CygxReportSelectionLog struct {
 	ArticleSunId           int       `description:"子级报告id"`
 	ArticleId              int       `description:"父级报告Id"`

models/resource_data.go

@@ -29,15 +29,17 @@ type CygxResourceDataResp struct {
 	Activityvideo   *MicroRoadShowPageList     `description:"活动视频"`
 	Activityvoice   *MicroRoadShowPageList     `description:"活动音频"`
 	Activityspecial *CygxActivitySpecialDetail `description:"专项调研活动"`
+	Researchsummary *CygxReportSelectionRep    `description:"本周研究汇总"`
+	Minutessummary  *CygxReportSelectionRep    `description:"上周纪要汇总"`
 }
 
-//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+// Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
 type HomeResourceDataListResp struct {
 	Paging *paging.PagingItem
 	List   []*CygxResourceDataResp `description:"列表"`
 }
 
-//列表
+// 列表
 func GetResourceDataList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxResourceData, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT	 *   FROM cygx_resource_data  WHERE 1= 1 `
@@ -49,7 +51,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	return
 }
 
-//获取用户报名成功数量
+// 获取用户报名成功数量
 func GetResourceDataCount(condition string, pars []interface{}) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_resource_data    WHERE 1= 1 ` + condition
 	o := orm.NewOrm()
@@ -57,14 +59,14 @@ func GetResourceDataCount(condition string, pars []interface{}) (count int, err
 	return
 }
 
-//添加
+// 添加
 func AddCygxResourceData(item *CygxResourceData) (lastId int64, err error) {
 	o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
 }
 
-//删除数据
+// 删除数据
 func DeleteResourceData(sourceId int, source string) (err error) {
 	o := orm.NewOrm()
 	sql := ` DELETE FROM cygx_resource_data WHERE source_id = ? AND source =?  `
@@ -72,7 +74,7 @@ func DeleteResourceData(sourceId int, source string) (err error) {
 	return
 }
 
-//修改数据
+// 修改数据
 func UpdateResourceData(sourceId int, source, publishDate string) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE cygx_resource_data SET publish_date=?  WHERE source_id=?  AND source =? `
@@ -80,7 +82,7 @@ func UpdateResourceData(sourceId int, source, publishDate string) (err error) {
 	return
 }
 
-//批量删除
+// 批量删除
 func DeleteResourceDataList(condition string, pars []interface{}) (err error) {
 	if condition == "" {
 		return

services/admin.go

@@ -1,6 +1,9 @@
 package services
 
-import "hongze/hongze_cygx/models"
+import (
+	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/utils"
+)
 
 func GetAdminMobileMap() (mapItem map[string]string, err error) {
 	adminList, e := models.GetAdminByRole()
@@ -30,3 +33,34 @@ func GetActivityCcustomerTypeList() (mapItem map[int]string, err error) {
 	mapItem = mapUserType
 	return
 }
+
+// GetRaiAdminMobileMap 获取权益内部人员手机号
+func GetRaiAdminMobileMap() (mapItem map[string]string) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg("获取权益内部人员手机号失败 ErrMsg:"+err.Error(), 2)
+
+		}
+	}()
+	adminList, e := models.GetAdminByRole()
+	if e != nil {
+		err = e
+		return
+	}
+	mapMobile := make(map[string]string)
+	for _, v := range adminList {
+		mapMobile[v.Mobile] = v.Mobile
+	}
+	mapItem = mapMobile
+	return
+}
+
+// 根据手机号判断是否属于权益
+func GetBelongingRai(mobile string) (isBelong bool) {
+	mapItem := GetRaiAdminMobileMap()
+	if mapItem[mobile] != "" {
+		isBelong = true
+	}
+	return
+}

services/resource_data.go

@@ -36,6 +36,8 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	var activityvideoIds []string
 	var activityvoiceIds []string
 	var activityspecialIds []int
+	var researchsummaryIds []int
+	var minutessummaryIds []int
 	//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
 	for _, v := range list {
 		if v.Source == "article" {
@@ -52,6 +54,10 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			activityvoiceIds = append(activityvoiceIds, strconv.Itoa(v.SourceId))
 		} else if v.Source == "activityspecial" {
 			activityspecialIds = append(activityspecialIds, v.SourceId)
+		} else if v.Source == "researchsummary" {
+			researchsummaryIds = append(researchsummaryIds, v.SourceId)
+		} else if v.Source == "minutessummary" {
+			minutessummaryIds = append(minutessummaryIds, v.SourceId)
 		}
 	}
 
@@ -79,6 +85,38 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		}
 	}
 
+	//处理本周研究汇总
+	if len(researchsummaryIds) > 0 {
+		pars = make([]interface{}, 0)
+		condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(researchsummaryIds)) + `)`
+		pars = append(pars, researchsummaryIds)
+
+		listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_research_summary", pars, 0, len(researchsummaryIds))
+		if e != nil {
+			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			return
+		}
+		for _, v := range listresearchsummary {
+			mapItems[fmt.Sprint("researchsummary", v.ArticleId)].Researchsummary = v
+		}
+	}
+
+	//处理上周纪要汇总
+	if len(minutessummaryIds) > 0 {
+		pars = make([]interface{}, 0)
+		condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(minutessummaryIds)) + `)`
+		pars = append(pars, minutessummaryIds)
+
+		listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_minutes_summary", pars, 0, len(minutessummaryIds))
+		if e != nil {
+			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			return
+		}
+		for _, v := range listresearchsummary {
+			mapItems[fmt.Sprint("minutessummary", v.ArticleId)].Minutessummary = v
+		}
+	}
+
 	detail, e := models.GetConfigByCode("city_img_url")
 	if e != nil {
 		err = errors.New("GetResourceDataList, Err: " + e.Error())