no message

controllers/morning_meeting.go

@@ -3,7 +3,10 @@ package controllers
 import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/services"
 	"hongze/hongze_cygx/utils"
+	"strconv"
+	"strings"
 )
 
 // 晨会精华
@@ -17,7 +20,7 @@ type MorningMeetingController struct {
 // @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Success Ret=200 {object} cygx.GetCygxTacticsTimeLineResp
 // @router /gather/list [get]
-func (this *MorningMeetingController) List() {
+func (this *MorningMeetingController) GatherList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -58,11 +61,38 @@ func (this *MorningMeetingController) List() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+	var meetids string
+	for _, v := range list {
+		meetids += v.MeetingIds + ","
+	}
+	meetids = strings.TrimRight(meetids, ",")
+	mapMeetName := make(map[string]string)
+	if meetids != "" {
+		pars = make([]interface{}, 0)
+		condition = ` 	AND id  IN(` + meetids + `) `
+		listMeet, err := models.GetCygxMorningMeetingReviewsList(condition, pars, 0, 10000)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败，Err:" + err.Error()
+		}
+		for _, v := range listMeet {
+			mapMeetName[strconv.Itoa(v.Id)] = v.IndustryNames
+		}
+	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	for _, v := range list {
 		item := new(models.CygxMorningMeetingGatherResp)
 		item.Id = v.Id
 		item.Title = v.Title
+		sliceMeetingIds := strings.Split(v.MeetingIds, ",")
+		for _, vM := range sliceMeetingIds {
+			if mapMeetName[vM] != "" {
+				item.IndustryName += mapMeetName[vM] + ","
+			}
+		}
+		item.IndustryName = strings.TrimRight(item.IndustryName, ",")
+		item.IndustryName = strings.Replace(item.IndustryName, ",", "】,【", -1)
+		item.IndustryName = "【" + item.IndustryName + "】"
 		resp.List = append(resp.List, item)
 	}
 	resp.Paging = page
@@ -71,3 +101,91 @@ func (this *MorningMeetingController) List() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title 晨会精华汇总详情
+// @Description 晨会精华汇总详情接口
+// @Param   Id   query   int  true       "Id"
+// @Success Ret=200 {object} cygx.GetCygxTacticsTimeLineResp
+// @router /gather/detail [get]
+func (this *MorningMeetingController) GatherDetail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+	if user == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		br.Ret = 408
+		return
+	}
+	id, _ := this.GetInt("Id")
+	resp := new(models.CygxMorningMeetingGatherDetailResp)
+	hasPermission, err := services.GetUserhasPermission(user)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取用户权限信息失败,Err:" + err.Error()
+	}
+	if hasPermission != 1 {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
+	var condition string
+	var pars []interface{}
+	condition += ` AND status = 1 AND  id = ?  `
+	pars = append(pars, id)
+	total, err := models.GetCygxMorningMeetingGatherCount(condition, pars)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	if total == 0 {
+		br.Msg = "内容不存在，或未发布"
+	}
+	detail, err := models.GetCygxMorningMeetingGatherById(condition, pars)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	var meetids string
+	meetids = detail.MeetingIds
+	detailResp := new(models.CygxMorningMeetingGatherDetail)
+	if meetids != "" {
+		pars = make([]interface{}, 0)
+		condition = ` 	AND meeting_id  IN(` + meetids + `) `
+		listMeet, err := models.GetCygxMorningMeetingReviewChapterList(condition, pars)
+		if err != nil {
+			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,
+			})
+		}
+	} else {
+		detailResp.List = make([]*models.CygxMorningMeetingGatherDetailListResp, 0)
+	}
+	detailResp.Id = detail.Id
+	detailResp.Title = detail.Title
+	detailResp.PublishTime = utils.GetTimeDateRemoveYear(detail.PublishTime)
+	detailResp.Department = "弘则产品组"
+	resp.Detail = detailResp
+	resp.HasPermission = hasPermission
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

models/cygx_morning_meeting_gather.go

@@ -36,7 +36,7 @@ func GetCygxMorningMeetingGatherCount(condition string, pars []interface{}) (cou
 type CygxMorningMeetingGatherResp struct {
 	Id           int    `description:"ID"`
 	Title        string `description:"标题"`
-	SubjectNames string `description:"多个标的名称"`
+	IndustryName string `description:"多个产业名称"`
 }
 
 type CygxMorningMeetingGatherListResp struct {
@@ -55,3 +55,36 @@ func GetCygxMorningMeetingGatherList(condition string, pars []interface{}, start
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+func GetCygxMorningMeetingGatherById(condition string, pars []interface{}) (item *CygxMorningMeetingGather, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_morning_meeting_gather WHERE  1= 1`
+	if condition != "" {
+		sql += condition
+	}
+	err = o.Raw(sql, pars).QueryRow(&item)
+	return
+}
+
+type CygxMorningMeetingGatherDetailListResp struct {
+	Id                  int    `description:"ID"`
+	IndustryId          int    `description:"产业id"` // 产业id
+	IndustryName        string `description:"产业名称"` // 产业名称
+	ChartPermissionName string `description:"行业名称"` // 行业名称
+	ChartPermissionId   int    `description:"行业id"` // 行业id
+	MeetingId           int    `description:"主表id"` // 主表id
+	Content             string `description:"内容"`   // 内容
+}
+
+type CygxMorningMeetingGatherDetailResp struct {
+	HasPermission int `description:"1:有该行业权限,正常展示，2：无该行业权限，不存在权益客户下，3:无该品类权限,已提交过申请，4：无该行业权限,未提交过申请，5：潜在客户，未提交过申请，6：潜在客户,已提交过申请"`
+	Detail        *CygxMorningMeetingGatherDetail
+}
+
+type CygxMorningMeetingGatherDetail struct {
+	Id          int    `description:"ID"`
+	Title       string `description:"标题"`
+	PublishTime string `description:"发布日期"`
+	Department  string `description:"作者"`
+	List        []*CygxMorningMeetingGatherDetailListResp
+}

models/cygx_morning_meeting_review_chapter.go

@@ -38,18 +38,14 @@ type AddMorningMeetingReviewsReq struct {
 	DoType      int `description:"操作类型 0，保存 、1，发布"`
 }
 
-//添加晨报点评章节
-func AddCygxMorningMeetingReviewChapter(item *CygxMorningMeetingReviewChapter) (err error) {
+// 列表
+func GetCygxMorningMeetingReviewChapterList(condition string, pars []interface{}) (items []*CygxMorningMeetingReviewChapter, err error) {
 	o := orm.NewOrm()
-	_, err = o.Insert(item)
-	return
-}
-
-//列表
-func GetCygxMorningMeetingReviewsListById(meetingId int) (items []*CygxMorningMeetingReviewChapter, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_morning_meeting_review_chapter WHERE meeting_id = ? `
-	_, err = o.Raw(sql, meetingId).QueryRows(&items)
+	sql := `SELECT * FROM cygx_morning_meeting_review_chapter WHERE 1 = 1 `
+	if condition != "" {
+		sql += condition
+	}
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
@@ -74,51 +70,8 @@ type CygxMorningMeetingReviewChapterRespItem struct {
 
 type CygxMorningMeetingReviewChapterResp struct {
 	MeetingTime string
-	Status int
-	List []*CygxMorningMeetingReviewChapterRespItem
-}
-
-//删除晨会点评章节
-func DeleteMorningMeetingChapter(reviewId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM cygx_morning_meeting_review_chapter WHERE meeting_id =? `
-	_, err = o.Raw(sql, reviewId).Exec()
-	return
-}
-
-//更新晨报点评章节
-func UpdateCygxMorningMeetingReviewChapter(item *CygxMorningMeetingReviewChapter) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE cygx_morning_meeting_review_chapter
-			SET
-			  meeting_time =?,
-			  modify_time = ?,
-			  industry_id = ?,
-			  industry_name = ?,
-			  chart_permission_id = ?,
-			  chart_permission_name = ?,
-			  industrial_subject_ids = ?,
-			  content = ? 
-			WHERE id = ? `
-	_, err = o.Raw(sql, item.MeetingTime, item.ModifyTime, item.IndustryId, item.IndustryName,
-		item.ChartPermissionId, item.ChartPermissionName, item.IndustrialSubjectIds, item.Content, item.Id).Exec()
-
-	return
-}
-
-func GetCygxMorningMeetingReviewsListByIdAndIndustryId(meetingId,  industryId int) (item *CygxMorningMeetingReviewChapter, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_morning_meeting_review_chapter WHERE meeting_id = ? AND industry_id = ? `
-	err = o.Raw(sql, meetingId, industryId).QueryRow(&item)
-	return
-}
-
-//删除晨会点评章节
-func DeleteMorningMeetingChapterById(chapterId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM cygx_morning_meeting_review_chapter WHERE id =? `
-	_, err = o.Raw(sql, chapterId).Exec()
-	return
+	Status      int
+	List        []*CygxMorningMeetingReviewChapterRespItem
 }
 
 func GetCygxMorningMeetingReviewsListByIndustrialIds(industrialIds string) (items []*CygxMorningMeetingReviewChapter, err error) {
@@ -126,4 +79,4 @@ func GetCygxMorningMeetingReviewsListByIndustrialIds(industrialIds string) (item
 	sql := `SELECT * FROM cygx_morning_meeting_review_chapter WHERE industry_id IN (` + industrialIds + `)  `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
-}
+}

models/industrial_management.go

@@ -220,6 +220,10 @@ type IndustrialManagementId struct {
 	IndustrialManagementId string `description:"产业Id"`
 }
 
+type IndustrialManagementName struct {
+	IndustryName string `description:"产业名称"`
+}
+
 // 获取归类产业报告数量大于10的
 func GetIndustrialMorethan10() (items []*IndustrialManagementId, err error) {
 	o := orm.NewOrm()

routers/commentsRouter.go

@@ -702,7 +702,16 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:MorningMeetingController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:MorningMeetingController"],
         beego.ControllerComments{
-            Method: "List",
+            Method: "GatherDetail",
+            Router: `/gather/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:MorningMeetingController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:MorningMeetingController"],
+        beego.ControllerComments{
+            Method: "GatherList",
             Router: `/gather/list`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),

services/morning_meeting.go

@@ -9,7 +9,7 @@ import (
 	"time"
 )
 
-func init123() {
+func init12321() {
 
 	for i := 180; i > 0; i-- {
 		init12(i)
@@ -42,8 +42,6 @@ func init12(day int) (err error) {
 	if total > 0 {
 		return
 	}
-	fmt.Println(total)
-	pars = make([]interface{}, 0)
 	pars = make([]interface{}, 0)
 	condition = ` 	AND publish_time  BETWEEN ?   AND  ? `
 	pars = append(pars, startDate, endDate)
@@ -60,7 +58,7 @@ func init12(day int) (err error) {
 		item.MeetingIds += strconv.Itoa(v.Id) + ","
 	}
 	item.MeetingIds = strings.TrimRight(item.MeetingIds, ",")
-	item.Title = utils.GetTimeDateHourAndDay(DayTime) + "(" + utils.StrDateTimeToWeek(DayTime.Format(utils.FormatDateTime)) + ")" + "|晨会精华"
+	item.Title = utils.GetTimeDateHourAndDay(DayTime) + "（" + utils.StrDateTimeToWeek(DayTime.Format(utils.FormatDateTime)) + "）" + "|晨会精华"
 	item.CreateTime = time.Now()
 	item.ModifyTime = time.Now()
 	item.PublishTime = endDate

utils/common.go

@@ -839,6 +839,19 @@ func GetTimeDateHourAndDay(DayTime time.Time) (dataStr string) {
 		}
 		dataStr += v + "."
 	}
-	dataStr = strings.TrimRight(dataStr, ",")
+	dataStr = strings.TrimRight(dataStr, ".")
 	return
 }
+
+// 时间格式去掉年
+func GetTimeDateRemoveYear(strTime string) (dataStr string) {
+	slicePublishTime := strings.Split(strTime, "-")
+	for k, v := range slicePublishTime {
+		if k == 0 {
+			continue
+		}
+		dataStr += v + "-"
+	}
+	dataStr = strings.TrimRight(dataStr, "-")
+	return dataStr
+}