no message

controllers/cygx/contract_allocation.go

@@ -912,6 +912,8 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 	mapPermissionAllocation := make(map[string]float64)
 	mapPermissionMoney := make(map[string]float64)
 	mapPermissionMoneyAvg := make(map[string]float64)
+	mapPermissionContract := make(map[string]float64) // 行业关联的合同数量
+	mapPermissionContractKey := make(map[string]bool) // 行业关联的合同数量键值对
 
 	//totalContract := lenArr //所有的关联合同
 	var totalMoney float64 //所有的关联合同的金额 单位万
@@ -941,6 +943,11 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 				mapPermissionMoney[v.ChartPermissionName] += v.Money
 				totalMoney += v.Money
 				companyContractIdBool[v.CompanyContractId] = true
+				//统计单个行业所关的合同数量
+				if !mapPermissionContractKey[fmt.Sprint("ChartPermissionName_", v.ChartPermissionName, "CompanyContractId_", v.CompanyContractId)] {
+					mapPermissionContract[v.ChartPermissionName] += 1
+					mapPermissionContractKey[fmt.Sprint("ChartPermissionName_", v.ChartPermissionName, "CompanyContractId_", v.CompanyContractId)] = true
+				}
 			}
 		}
 		for _, v := range allocationCompanyContractPermissionList {
@@ -993,7 +1000,7 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 		lenUser := len(v)
 		item := new(cygx.AllocationRealNameStatisticsListResp)
 		item.RealName = "合计"
-		item.TotalRelatedContract = mapPermissionAllocation[k]
+		item.TotalRelatedContract = mapPermissionContract[k]
 		item.TotalDispatchPoint = fmt.Sprint(utils.SubFloatToString(mapPermissionMoney[k], 2), "/", utils.SubFloatToString(mapPermissionMoneyAvg[k], 2))
 		item.GroupProportion = "100%"
 

controllers/cygx/morning_meeting_review.go

@@ -213,6 +213,16 @@ func (this *MorningMeetingController) PreserveAndPublish() {
 					}
 				}
 			}
+			//解析报告链接中的ID
+			var linkArticleId int
+			if req.ReportLink != "" {
+				linkArticleId, err = cygxService.GetReportLinkToArticleid(req.ReportLink)
+				if err != nil {
+					br.Msg = "操作失败"
+					br.ErrMsg = "解析报告链接ID失败，Err:" + err.Error()
+					return
+				}
+			}
 
 			item := cygx.CygxMorningMeetingReviewChapter{
 				MeetingTime:          meetingTime,
@@ -225,6 +235,9 @@ func (this *MorningMeetingController) PreserveAndPublish() {
 				IndustrialSubjectIds: req.IndustrialSubjectIds,
 				MeetingId:            meetingId,
 				Content:              req.Content,
+				ReportLink:           req.ReportLink,
+				LinkArticleId:        linkArticleId,
+				Title:                req.Title,
 			}
 			err := cygx.AddCygxMorningMeetingReviewChapter(&item)
 			if err != nil {
@@ -344,6 +357,16 @@ func (this *MorningMeetingController) PreserveAndPublish() {
 					}
 				}
 			}
+			//解析报告链接中的ID
+			var linkArticleId int
+			if req.ReportLink != "" {
+				linkArticleId, err = cygxService.GetReportLinkToArticleid(req.ReportLink)
+				if err != nil {
+					br.Msg = "操作失败"
+					br.ErrMsg = "解析报告链接ID失败，Err:" + err.Error()
+					return
+				}
+			}
 
 			//有可能在编辑时新增了段落
 			if req.ChapterId == 0 {
@@ -358,6 +381,9 @@ func (this *MorningMeetingController) PreserveAndPublish() {
 					IndustrialSubjectIds: req.IndustrialSubjectIds,
 					MeetingId:            int64(reqList.MeetingId),
 					Content:              req.Content,
+					ReportLink:           req.ReportLink,
+					LinkArticleId:        linkArticleId,
+					Title:                req.Title,
 				}
 				err := cygx.AddCygxMorningMeetingReviewChapter(&item)
 				if err != nil {
@@ -377,6 +403,9 @@ func (this *MorningMeetingController) PreserveAndPublish() {
 					IndustrialSubjectIds: req.IndustrialSubjectIds,
 					MeetingId:            int64(reqList.MeetingId),
 					Content:              req.Content,
+					ReportLink:           req.ReportLink,
+					LinkArticleId:        linkArticleId,
+					Title:                req.Title,
 				}
 				err := cygx.UpdateCygxMorningMeetingReviewChapter(&item)
 				if err != nil {
@@ -495,6 +524,8 @@ func (this *MorningMeetingController) Detail() {
 			IndustrialSubjectList: subjectItemList,
 			MeetingId:             chapter.MeetingId,
 			Content:               chapter.Content,
+			Title:                 chapter.Title,
+			ReportLink:            chapter.ReportLink,
 		}
 		resp.List = append(resp.List, &respItem)
 	}

controllers/cygx/summary_manage.go

@@ -688,7 +688,7 @@ func (this *SummaryManage) SummaryManageList() {
 		return
 	}
 	condition += ` GROUP BY art.article_id `
-	condition += ` ORDER BY art.publish_date DESC `
+	condition += ` ORDER BY  art.top_time DESC , art.publish_date DESC `
 	list, errList := cygx.GetSummaryManageList(condition, pars, startSize, pageSize)
 	if errList != nil {
 		br.Msg = "获取失败"
@@ -1645,3 +1645,59 @@ func (this *SummaryManage) VisibleRange() {
 	br.Msg = "操作成功"
 	br.IsAddLog = true
 }
+
+// @Title 文章的置顶与取消置顶
+// @Description 活动的发布与取消发布接口
+// @Param	request	body cygx.ActivityIdRep true "type json string"
+// @Success 200 操作成功
+// @router /summaryManage/top_change [post]
+func (this *SummaryManage) TopeChange() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	AdminUser := this.SysUser
+
+	if AdminUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		br.Ret = 408
+		return
+	}
+	var req cygx.SummaryManageIdRep
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	articleId := req.ArticleId
+
+	articleInfo, errInfo := cygx.GetArticleInfoOtherByArticleId(articleId)
+	if articleInfo == nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "纪要ID错误"
+		return
+	}
+	if errInfo != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
+		return
+	}
+	var topTime int
+	//如果有置顶时间就设为取消置顶，如果没有就写入当前置顶时间
+	if articleInfo.TopTime == 0 {
+		topTime = int(time.Now().Unix())
+	}
+	err = cygx.UpdateArticleTopTime(articleId, topTime)
+	if err != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+	br.IsAddLog = true
+}

models/cygx/cygx_morning_meeting_review_chapter.go

@@ -18,6 +18,9 @@ type CygxMorningMeetingReviewChapter struct {
 	IndustrialSubjectIds string    `json:"industrialSubjectId"` // 标的id
 	MeetingId            int64     `json:"meetingId"`           // 主表id
 	Content              string    `json:"content"`             // 内容
+	Title                string    `json:"title"`               // 标题
+	ReportLink           string    `json:"reportLink"`          // 报告链接
+	LinkArticleId        int       `json:"linkArticleId"`       // 报告ID链接
 }
 
 type AddMorningMeetingReviewItem struct {
@@ -28,6 +31,8 @@ type AddMorningMeetingReviewItem struct {
 	IndustryId           int
 	IndustryName         string
 	IndustrialSubjectIds string
+	ReportLink           string `description:"报告链接"`
+	Title                string `description:"标题"`
 }
 
 type AddMorningMeetingReviewsReq struct {
@@ -82,6 +87,8 @@ type CygxMorningMeetingReviewChapterRespItem struct {
 	IndustrialSubjectList []*IndustrialSubjectItem `json:"industrialSubjectList"` // 标的list
 	MeetingId             int64                    `json:"meetingId"`             // 主表id
 	Content               string                   `json:"content"`               // 内容
+	Title                 string                   `json:"title"`                 // 标题
+	ReportLink            string                   `json:"reportLink"`            // 报告链接
 }
 
 type CygxMorningMeetingReviewChapterResp struct {
@@ -110,10 +117,13 @@ func UpdateCygxMorningMeetingReviewChapter(item *CygxMorningMeetingReviewChapter
 			  chart_permission_id = ?,
 			  chart_permission_name = ?,
 			  industrial_subject_ids = ?,
-			  content = ? 
+			  content = ?,
+			  report_link = ?,
+			  link_article_id = ?,
+			  title = ?
 			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()
+		item.ChartPermissionId, item.ChartPermissionName, item.IndustrialSubjectIds, item.Content, item.ReportLink, item.LinkArticleId, item.Title, item.Id).Exec()
 
 	return
 }

models/cygx/summary_manage.go

@@ -136,6 +136,7 @@ type CygxArticleResp struct {
 	AdminName          string    `description:"销售/管理员姓名"`
 	Annotation         string    `description:"核心观点"`
 	VisibleRange       int       `description:"设置可见范围1全部，0内部"`
+	TopTime            int       `description:"置顶时间"`
 }
 
 type GetSummaryManageListRep struct {
@@ -293,6 +294,7 @@ type CygxArticleList struct {
 	ArticleTypeId   int    `description:"文章类型ID"`
 	ArticleTypeName string `description:"文章类型名称"`
 	VisibleRange    int    `description:"设置可见范围1全部，0内部"`
+	TopTime         int    `description:"置顶时间"`
 }
 
 // 列表
@@ -304,7 +306,7 @@ func GetSummaryManageList(condition string, pars []interface{}, startSize, pageS
 		(SELECT COUNT(1) FROM cygx_article_comment AS k    WHERE k.article_id=art.article_id) AS comment_num,
 		(SELECT COUNT(1) FROM cygx_article_collect AS c   WHERE c.article_id = art.article_id ) AS collection_num,
 		(SELECT GROUP_CONCAT(DISTINCT s.subject_name  SEPARATOR '/')  FROM cygx_industrial_subject as s  WHERE s.industrial_management_id = m.industrial_management_id) AS subject_name ,
-		art.title ,art.category_name ,art.publish_date ,art.id,art.last_updated_time,art.publish_status,art.abstract,art.body,art.article_id_md5 ,art.article_id,dm.nick_name , art.department_id,m.industry_name,art.article_type_id,art.article_type_name,art.visible_range
+		art.title ,art.category_name ,art.publish_date ,art.id,art.last_updated_time,art.publish_status,art.abstract,art.body,art.article_id_md5 ,art.article_id,dm.nick_name , art.department_id,m.industry_name,art.article_type_id,art.article_type_name,art.visible_range,art.top_time
 		FROM cygx_article as art 
 		LEFT JOIN cygx_article_department as dm ON dm.department_id = art.department_id
 		LEFT JOIN cygx_industrial_article_group_management as mg ON mg.article_id = art.article_id 
@@ -582,3 +584,11 @@ GROUP BY
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
+
+// 更新文章置顶时间
+func UpdateArticleTopTime(activityId, topTime int) (err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` UPDATE cygx_article SET  top_time=? WHERE article_id=?`
+	_, err = o.Raw(sql, topTime, activityId).Exec()
+	return
+}

routers/commentsRouter.go

@@ -2698,6 +2698,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:SummaryManage"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:SummaryManage"],
+        beego.ControllerComments{
+            Method: "TopeChange",
+            Router: `/summaryManage/top_change`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:SummaryManage"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:SummaryManage"],
         beego.ControllerComments{
             Method: "VisibleRange",