Merge branch 'cygx_10.3' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/chart_permission.go

@@ -173,7 +173,7 @@ func (this *ChartPermissionAuthController) StrategyDetail() {
 	if chartPermissionId == 0 {
 		chartPermissionId = utils.CE_LUE_ID
 	}
-	//uid := user.UserId
+	uid := user.UserId
 	list, err := models.GetReportMappingStrategyHomeAllByCygx(chartPermissionId)
 
 	if err != nil {
@@ -181,23 +181,23 @@ func (this *ChartPermissionAuthController) StrategyDetail() {
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
-	//for k, v := range list {
-	//	count, err := models.GetUserIsReadThisNewCategoryArticleCount(v.CategoryId, uid)
-	//	if err != nil && err.Error() != utils.ErrNoRow() {
-	//		br.Msg = "获取信息失败"
-	//		br.ErrMsg = "获取品种信息失败，Err:" + err.Error()
-	//		return
-	//	}
-	//	Newdetail, err := models.GetNewArticleByCategoryId(v.CategoryId)
-	//	if err != nil {
-	//		br.Msg = "获取信息失败"
-	//		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-	//		return
-	//	}
-	//	if count == 0 && user.CreatedTime.Before(utils.StrTimeToTime(Newdetail.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(Newdetail.PublishDate)) {
-	//		list[k].IsRed = true
-	//	}
-	//}
+	for k, v := range list {
+		count, err := models.GetUserIsReadThisNewCategoryArticleCount(v.CategoryId, uid)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取品种信息失败，Err:" + err.Error()
+			return
+		}
+		Newdetail, err := models.GetNewArticleByCategoryId(v.CategoryId)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取信息失败,Err:" + err.Error()
+			return
+		}
+		if count == 0 && user.CreatedTime.Before(utils.StrTimeToTime(Newdetail.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(Newdetail.PublishDate)) {
+			list[k].IsRed = true
+		}
+	}
 	cf, err := models.GetConfigByCode(utils.CYGX_TACTICS_TIME_LINE_STATUS)
 	if err != nil {
 		br.Msg = "获取失败"

models/article.go

@@ -440,10 +440,12 @@ func GetPermissionMappingCategoryID() (item []*PermissionMappingCategoryRep, err
 
 // 检查用户是否阅读某一分类最新文章
 func GetUserIsReadThisNewCategoryArticleCount(categoryId, uid int) (count int, err error) {
-	sqlCount := `SELECT COUNT(1) as count FROM
+	sqlCount := `SELECT
+	COUNT( 1 ) AS count 
+FROM
 	cygx_article_history_record 
-	WHERE
-	article_id = ( SELECT article_id FROM cygx_article WHERE category_id = ? ORDER BY publish_date DESC LIMIT 0, 1 )
+WHERE
+	article_id = ( SELECT article_id FROM cygx_article WHERE category_id IN ( SELECT category_id_celue FROM cygx_report_mapping_group WHERE id_cygx = ? ) ORDER BY publish_date DESC LIMIT 0, 1 ) 
 	AND user_id = ?`
 	o := orm.NewOrm()
 	err = o.Raw(sqlCount, categoryId, uid).QueryRow(&count)

models/report.go

@@ -295,7 +295,7 @@ WHERE
 // 获取最新文章
 func GetNewArticleByCategoryId(categoryId int) (item *ArticleDetail, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM cygx_article WHERE  category_id = ? ORDER BY publish_date DESC LIMIT 0, 1`
+	sql := ` SELECT * FROM cygx_article WHERE  category_id IN ( SELECT category_id_celue FROM cygx_report_mapping_group WHERE id_cygx = ? ) ORDER BY publish_date DESC LIMIT 0, 1 `
 	err = o.Raw(sql, categoryId).QueryRow(&item)
 	return
 }

services/init_10.3.go

@@ -0,0 +1,75 @@
+package services
+
+import (
+	"fmt"
+	"hongze/hongze_cygx/models"
+)
+
+//10.3版本上线需要更新的数据
+
+func init1111() {
+	var condition string
+	var pars []interface{}
+	var err error
+	fmt.Print()
+	//处理上周纪要汇总
+	condition = ` AND  visible_range = 1  `
+	listresearchsummary, err := models.GetReportSelectionListHome(condition, "cygx_minutes_summary", pars, 0, 100000)
+	if err != nil {
+		fmt.Println(err)
+	}
+	condition = ` AND source = 'minutessummary'  `
+	err = models.DeleteResourceDataList(condition, pars)
+	if err != nil {
+		fmt.Println(err)
+	}
+	for _, v := range listresearchsummary {
+		go UpdateResourceData(v.ArticleId, "minutessummary", "add", v.PublishDate)
+	}
+
+	fmt.Println(listresearchsummary)
+}
+
+func init2222() {
+	var condition string
+	var pars []interface{}
+	var err error
+	fmt.Print()
+	//处理本周纪要汇总
+	condition = ` AND  visible_range = 1  `
+	listresearchsummary, err := models.GetReportSelectionListHome(condition, "cygx_research_summary", pars, 0, 100000)
+	if err != nil {
+		fmt.Println(err)
+	}
+	condition = ` AND source = 'researchsummary'  `
+	err = models.DeleteResourceDataList(condition, pars)
+	if err != nil {
+		fmt.Println(err)
+	}
+	for _, v := range listresearchsummary {
+		go UpdateResourceData(v.ArticleId, "researchsummary", "add", v.PublishDate)
+	}
+
+	fmt.Println(listresearchsummary)
+}
+
+func init333() {
+	var condition string
+	var pars []interface{}
+	var err error
+	fmt.Print()
+	//处理晨会精华
+	listrMeet, err := models.GetCygxMorningMeetingReviewChapterList(condition, pars)
+	if err != nil {
+		fmt.Println(err)
+	}
+	condition = ` AND source = 'meetingreviewchapt'  `
+	err = models.DeleteResourceDataList(condition, pars)
+	if err != nil {
+		fmt.Println(err)
+	}
+	for _, v := range listrMeet {
+		go UpdateResourceData(v.Id, "meetingreviewchapt", "add", v.PublishTime)
+	}
+	fmt.Println(listrMeet)
+}

services/morning_meeting.go

@@ -27,7 +27,7 @@ func MakeMorningMeetingReviews(cont context.Context) (err error) {
 			go utils.SendAlarmMsg("定时生成晨会精华汇总失败，err:"+err.Error(), 2)
 		}
 	}()
-	day := 1
+	day := 0
 	hourstr := " 10:30:00 "
 	DayTime := time.Now().AddDate(0, 0, -day)
 	startSize := 0