Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/article.go

@@ -757,6 +757,13 @@ func GetCygxCygxArticleList(condition string, pars []interface{}, startSize, pag
 	return
 }
 
+func ModifyArticleTitleByarticleId(articleId int, title string) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE cygx_article SET title= ?  WHERE article_id=? `
+	_, err = o.Raw(sql, title, articleId).Exec()
+	return
+}
+
 // 获取数量
 func GetCygxArticleCount(condition string, pars []interface{}) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article as art WHERE 1= 1  `

models/rai_serve/rai_serve_company.go

@@ -58,7 +58,7 @@ func AddCygxRaiServeCompanyMulti(items, itemsUpdate []*CygxRaiServeCompany, delC
 	}
 
 	if len(itemsUpdate) > 0 {
-		p, errUpdate := o.Raw("UPDATE cygx_rai_serve_company SET company_name = ? ,seller_id =? ,seller_name = ?  ,start_date = ? ,end_date = ? ,share_seller = ? ,share_seller_id = ? ,group_id = ? ,share_group_id = ?  WHERE company_id = ?").Prepare()
+		p, errUpdate := o.Raw("UPDATE cygx_rai_serve_company SET company_name = ? ,seller_id =? ,seller_name = ?  ,start_date = ? ,end_date = ? ,share_seller = ? ,share_seller_id = ? ,group_id = ? ,share_group_id = ?,status = ?  WHERE company_id = ?").Prepare()
 		if errUpdate != nil {
 			err = errUpdate
 			return
@@ -68,7 +68,7 @@ func AddCygxRaiServeCompanyMulti(items, itemsUpdate []*CygxRaiServeCompany, delC
 		}()
 
 		for _, v := range itemsUpdate {
-			_, err = p.Exec(v.CompanyName, v.SellerId, v.SellerName, v.StartDate, v.EndDate, v.ShareSeller, v.ShareSellerId, v.GroupId, v.ShareGroupId, v.CompanyId)
+			_, err = p.Exec(v.CompanyName, v.SellerId, v.SellerName, v.StartDate, v.EndDate, v.ShareSeller, v.ShareSellerId, v.GroupId, v.ShareGroupId, v.Status, v.CompanyId)
 			if err != nil {
 				return
 			}

services/article.go

@@ -1005,7 +1005,9 @@ func HandleArticleListByApi(artcleId int) (err error) {
 				titleNew = v.Title + utils.WeekByDate(v.PublishDate)
 			}
 		}
-		if v.CategoryId == 80 {
+
+		//策略周度思考，医药周报，消费周报，消费周度思考，科技前言（周报）、智造精粹、智造本周荟 标题处理
+		if v.CategoryId == 80 || v.CategoryId == 52 || v.CategoryId == 10074 || v.CategoryId == 1008 || v.CategoryId == 10071 || v.CategoryId == 10073 || v.CategoryId == 50 {
 			titleNew = v.Title + utils.WeekByDate(v.PublishDate)
 		}
 
@@ -3087,3 +3089,52 @@ func HandleArticleListByApiInit13_5GuShou(artcleId int) (err error) {
 	AddCygxReportMappingCategoryGroupByArticleId(artcleId)
 	return err
 }
+
+// 需求池972 修改部分报告类型title
+func initweek() {
+	var category_id int
+	//category_id = 52
+	//category_id = 10074
+	//category_id = 1008
+	//category_id = 10071
+	//category_id = 10073
+	//category_id = 50
+	var condition string
+	var pars []interface{}
+	condition += ` AND category_id = ? AND  publish_date  > '2023-12-31'  `
+	pars = append(pars, category_id)
+	articleList, e := models.GetCygxCygxArticleList(condition, pars, 0, 1000)
+	if e != nil {
+		fmt.Println(e)
+		return
+	}
+	var clueApiUrl string
+	for _, v := range articleList {
+
+		clueApiUrl = fmt.Sprint(utils.ApiUrl, "articles/", v.ArticleId)
+		fmt.Println(clueApiUrl)
+
+		authorization := utils.ApiAuthorization
+		body, err := PublicGetDate(clueApiUrl, authorization)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		var articleResultDate models.ArticleDetailResultApi
+		err = json.Unmarshal(body, &articleResultDate)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		articleResult := articleResultDate.Data
+
+		titleWeek := articleResult.Title + utils.WeekByDate(articleResult.PublishDate)
+
+		fmt.Println(titleWeek)
+		e = models.ModifyArticleTitleByarticleId(v.ArticleId, titleWeek)
+		if e != nil {
+			fmt.Println(e)
+			return
+		}
+	}
+}

services/rai_serve_count.go

@@ -300,7 +300,7 @@ func GetCompanyReportPermissionNameMapByCompanyId(companyIds []int) (mapContract
 	var condition string
 	var pars []interface{}
 
-	condition += " AND  company_id IN (" + utils.GetOrmInReplace(lenArr) + ") AND product_id = 2 AND status = '正式' "
+	condition += " AND  company_id IN (" + utils.GetOrmInReplace(lenArr) + ") AND product_id = 2 AND status  IN ( '正式','永续') "
 	pars = append(pars, companyIds)
 
 	permissionList, e := models.GetChartPermissionList()
@@ -1121,6 +1121,9 @@ func UpdateCygxRaiServeBillWeekTask() (err error) {
 	var itemsUpdate []*rai_serve.CygxRaiServeWeekBill
 	for _, v := range companyList {
 		for i := 0; i < weeks; i++ {
+			if i == 10 {
+				continue
+			}
 			item := new(rai_serve.CygxRaiServeWeekBill)
 			// 计算当前周的周一
 			monday := now.AddDate(0, 0, -int(now.Weekday()-time.Monday)-i*7)
@@ -1174,6 +1177,10 @@ func UpdateCygxRaiServeBillWeekTask() (err error) {
 	return
 }
 
+//func init() {
+//	UpdateWeekAvg()
+//}
+
 // 更新最近四周平均覆盖率，是否标红，权限，时间，金额
 func UpdateWeekAvg() (err error) {
 	defer func() {
@@ -1230,8 +1237,9 @@ func UpdateWeekAvg() (err error) {
 	var formalCompanyIds []int   // 当前正式客户ID
 	var formalNoCompanyIds []int // 当前非正式客户ID
 
+	//永续客户当做正式客户处理
 	for _, v := range companyList {
-		if v.Status == "正式" {
+		if v.Status == "正式" || v.Status == "永续" {
 			formalCompanyIds = append(formalCompanyIds, v.CompanyId)
 		} else {
 			formalNoCompanyIds = append(formalNoCompanyIds, v.CompanyId)

utils/common.go

@@ -617,20 +617,21 @@ func TimeRemoveHms2(strTime string) string {
 func WeekByDate(t time.Time) string {
 	var resultSAtr string
 	//t = t.AddDate(0, 0, -8) // 减少八天跟老数据标题统一
-	yearDay := t.YearDay()
-	yearFirstDay := t.AddDate(0, 0, -yearDay+1)
-	firstDayInWeek := int(yearFirstDay.Weekday())
+	//yearDay := t.YearDay()
+	//yearFirstDay := t.AddDate(0, 0, -yearDay+1)
+	//firstDayInWeek := int(yearFirstDay.Weekday())
 	//今年第一周有几天
-	firstWeekDays := 1
-	if firstDayInWeek != 0 {
-		firstWeekDays = 7 - firstDayInWeek + 1
-	}
+	//firstWeekDays := 1
+	//if firstDayInWeek != 0 {
+	//	firstWeekDays = 7 - firstDayInWeek + 1
+	//}
+	//if yearDay <= firstWeekDays {
+	//	week = 1
+	//} else {
+	//	week = (yearDay-firstWeekDays)/7 + 2
+	//}
 	var week int
-	if yearDay <= firstWeekDays {
-		week = 1
-	} else {
-		week = (yearDay-firstWeekDays)/7 + 2
-	}
+	_, week = t.ISOWeek()
 	resultSAtr = "(" + strconv.Itoa(t.Year()) + "年第" + strconv.Itoa(week) + "周" + ")"
 	return resultSAtr
 }