首页晨会精华展示

controllers/morning_meeting.go

@@ -164,17 +164,18 @@ func (this *MorningMeetingController) GatherDetail() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + err.Error()
 		}
-		for _, v := range listMeet {
-			detailResp.List = append(detailResp.List, &models.CygxMorningMeetingGatherDetailListResp{
-				Id:                  v.Id,
-				IndustryId:          v.IndustryId,
-				IndustryName:        v.IndustryName,
-				ChartPermissionName: v.ChartPermissionName,
-				ChartPermissionId:   v.ChartPermissionId,
-				MeetingId:           int(v.MeetingId),
-				Content:             v.Content,
-			})
-		}
+		detailResp.List = listMeet
+		//for _, v := range listMeet {
+		//	detailResp.List = append(detailResp.List, &models.CygxMorningMeetingGatherDetailListResp{
+		//		Id:                  v.Id,
+		//		IndustryId:          v.IndustryId,
+		//		IndustryName:        v.IndustryName,
+		//		ChartPermissionName: v.ChartPermissionName,
+		//		ChartPermissionId:   v.ChartPermissionId,
+		//		MeetingId:           int(v.MeetingId),
+		//		Content:             v.Content,
+		//	})
+		//}
 	} else {
 		detailResp.List = make([]*models.CygxMorningMeetingGatherDetailListResp, 0)
 	}

models/cygx_morning_meeting_review_chapter.go

@@ -20,26 +20,8 @@ type CygxMorningMeetingReviewChapter struct {
 	Content              string    `json:"content"`             // 内容
 }
 
-type AddMorningMeetingReviewItem struct {
-	ChapterId            int
-	Content              string
-	ChartPermissionId    int
-	ChartPermissionName  string
-	IndustryId           int
-	IndustryName         string
-	IndustrialSubjectIds string
-}
-
-type AddMorningMeetingReviewsReq struct {
-	List        []*AddMorningMeetingReviewItem
-	MeetingId   int
-	MeetingTime string
-	PublishTime string
-	DoType      int `description:"操作类型 0，保存 、1，发布"`
-}
-
 // 列表
-func GetCygxMorningMeetingReviewChapterList(condition string, pars []interface{}) (items []*CygxMorningMeetingReviewChapter, err error) {
+func GetCygxMorningMeetingReviewChapterList(condition string, pars []interface{}) (items []*CygxMorningMeetingGatherDetailListResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_morning_meeting_review_chapter WHERE 1 = 1 `
 	if condition != "" {

models/resource_data.go

@@ -18,19 +18,20 @@ type CygxResourceData struct {
 }
 
 type CygxResourceDataResp struct {
-	Id              int                        `orm:"column(id);pk"`
-	SourceId        int                        `description:"资源ID"`
-	Source          string                     `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
-	PublishDate     string                     `description:"发布时间"`
-	Article         *HomeArticle               `description:"文章"`
-	Newchart        *HomeChartListResp         `description:"图表"`
-	Roadshow        *MicroRoadShowPageList     `description:"微路演"`
-	Activity        *ActivityDetail            `description:"活动"`
-	Activityvideo   *MicroRoadShowPageList     `description:"活动视频"`
-	Activityvoice   *MicroRoadShowPageList     `description:"活动音频"`
-	Activityspecial *CygxActivitySpecialDetail `description:"专项调研活动"`
-	Researchsummary *CygxReportSelectionRep    `description:"本周研究汇总"`
-	Minutessummary  *CygxReportSelectionRep    `description:"上周纪要汇总"`
+	Id                 int                                     `orm:"column(id);pk"`
+	SourceId           int                                     `description:"资源ID"`
+	Source             string                                  `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+	PublishDate        string                                  `description:"发布时间"`
+	Article            *HomeArticle                            `description:"文章"`
+	Newchart           *HomeChartListResp                      `description:"图表"`
+	Roadshow           *MicroRoadShowPageList                  `description:"微路演"`
+	Activity           *ActivityDetail                         `description:"活动"`
+	Activityvideo      *MicroRoadShowPageList                  `description:"活动视频"`
+	Activityvoice      *MicroRoadShowPageList                  `description:"活动音频"`
+	Activityspecial    *CygxActivitySpecialDetail              `description:"专项调研活动"`
+	Researchsummary    *CygxReportSelectionRep                 `description:"本周研究汇总"`
+	Minutessummary     *CygxReportSelectionRep                 `description:"上周纪要汇总"`
+	Meetingreviewchapt *CygxMorningMeetingGatherDetailListResp `description:"晨会精华"`
 }
 
 // Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`

services/resource_data.go

@@ -38,7 +38,8 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	var activityspecialIds []int
 	var researchsummaryIds []int
 	var minutessummaryIds []int
-	//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+	var meetingreviewchaptIds []int
+	//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial 、 本周研究汇总： researchsummary 、 上周纪要汇总 ：minutessummary 、晨会精华 ：meetingreviewchapt "`
 	for _, v := range list {
 		if v.Source == "article" {
 			articleIds = append(articleIds, v.SourceId)
@@ -58,6 +59,8 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			researchsummaryIds = append(researchsummaryIds, v.SourceId)
 		} else if v.Source == "minutessummary" {
 			minutessummaryIds = append(minutessummaryIds, v.SourceId)
+		} else if v.Source == "meetingreviewchapt" {
+			meetingreviewchaptIds = append(meetingreviewchaptIds, v.SourceId)
 		}
 	}
 
@@ -85,19 +88,35 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		}
 	}
 
-	//处理本周研究汇总
-	if len(researchsummaryIds) > 0 {
+	//处理晨会精华
+	if len(meetingreviewchaptIds) > 0 {
 		pars = make([]interface{}, 0)
-		condition = ` AND article_id IN (` + utils.GetOrmInReplace(len(researchsummaryIds)) + `)`
-		pars = append(pars, researchsummaryIds)
+		condition = ` AND id IN (` + utils.GetOrmInReplace(len(meetingreviewchaptIds)) + `)`
+		pars = append(pars, meetingreviewchaptIds)
 
-		listresearchsummary, e := models.GetReportSelectionListHome(condition, "cygx_research_summary", pars, 0, len(researchsummaryIds))
+		listrMeet, e := models.GetCygxMorningMeetingReviewChapterList(condition, pars)
+		if e != nil {
+			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			return
+		}
+		for _, v := range listrMeet {
+			mapItems[fmt.Sprint("meetingreviewchapt", v.Id)].Meetingreviewchapt = 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("researchsummary", v.ArticleId)].Researchsummary = v
+			mapItems[fmt.Sprint("minutessummary", v.ArticleId)].Minutessummary = v
 		}
 	}