Merge remote-tracking branch 'origin/debug' into debug

controllers/report.go

@@ -2818,6 +2818,8 @@ func (this *ReportController) SearchReportAndResource() {
 	sqlGroup = ` GROUP BY  a.article_id  ORDER BY a.publish_date DESC  `
 	if pageSize > 0 {
 		sqlGroup += ` LIMIT 5 `
+	} else {
+		pageSize = 100
 	}
 	ListYxReport, err := models.GetArticleCollectionList(` AND a.article_id >= 1000000 `+condition+sqlGroup, user.UserId)
 	if err != nil {
@@ -3081,7 +3083,6 @@ func (this *ReportController) StockNameList() {
 			}
 		}
 
-
 		//index := strings.Index(item.Stock, "(")
 		//item.Stock = item.Stock[:index]
 		//if strings.Contains(item.Stock, "-B"){

models/article.go

@@ -537,6 +537,7 @@ type ArticleResultApidate struct {
 	Field         ArticleField             `json:"field"`
 	Corpus        Corpus                   `json:"corpus"`
 	Cover         string                   `json:"cover"`
+	TypeId        int                      `json:"type_id"`
 }
 
 type ArticleField struct {
@@ -679,4 +680,4 @@ WHERE
 
 type SummaryArticleStockResp struct {
 	List []*SummaryArticleStock
-}
+}

services/activity_special.go

@@ -74,6 +74,11 @@ func UpdateCygxActivitySpecialSignupNum(cont context.Context) (err error) {
 //处理专项调研的展示
 func GetActivityLabelSpecialList(user *models.WxUserItem, isPower int, chartPermissionIds, permissionNameStr string) (item *models.ActivityTypeHome, err error) {
 	itemList := new(models.ActivityTypeHome)
+	if user.CompanyId <= 1 {
+		itemList.List = make([]*models.CygxActivityLabelList, 0)
+		item = itemList
+		return
+	}
 	userType, e := GetSpecialUserType(user)
 	if e != nil {
 		err = errors.New("GetSpecialUserType, Err: " + e.Error())
@@ -514,7 +519,7 @@ func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, st
 	var pars, parsSpecil []interface{}
 	if keywords != "" {
 		keywords = "%" + keywords + "%"
-		conditionSpecil += ` AND (art.research_theme LIKE ? OR art.label LIKE ? OR art.industrial_name LIKE ? OR art.industrial_subject_name LIKE ? ) `
+		conditionSpecil += ` AND art.days > 0 AND (art.research_theme LIKE ? OR art.label LIKE ? OR art.industrial_name LIKE ? OR art.industrial_subject_name LIKE ? ) `
 		parsSpecil = append(parsSpecil, keywords, keywords, keywords, keywords)
 	}
 	list, totalSearche, e := models.GetActivitySpecialSearcheList(condition, pars, conditionSpecil, parsSpecil, startSize, pageSize)

services/article.go

@@ -678,7 +678,7 @@ func GetArticleListByApi(cont context.Context) (err error) {
 }
 
 //func init() {
-//	HandleArticleListByApi(5978)
+//	HandleArticleListByApi(6005)
 //}
 
 //处理同步过来的文章
@@ -744,6 +744,10 @@ func HandleArticleListByApi(artcleId int) (err error) {
 	var list []*models.Tactics2
 	var listArticleData []*models.CygxArticleData
 	var listAuthor []*models.CygxArticleAuthor
+	//如果是英文报告那么则不同步
+	if articleResult.TypeId == 9 {
+		return
+	}
 
 	//状态等于 2 跟 4 的进行同步
 	if exitMap[articleResult.SeriesId] > 0 && (articleResult.PublishStatus == 2 || articleResult.PublishStatus == 4) {
@@ -917,6 +921,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 				return err
 			}
 			v.CategoryId = detailCategory.CategoryId
+			v.IsSummary = 0
 		}
 
 		if count > 0 {
@@ -1113,16 +1118,17 @@ func HandleArticleListByApi(artcleId int) (err error) {
 					fmt.Println("AddCygxArticleData Err:", err.Error())
 					return err
 				}
-			} else {
-				updateParams := make(map[string]interface{})
-				updateParams["Cover"] = v.Cover
-				whereParam := map[string]interface{}{"article_id": v.ArticleId}
-				err = models.UpdateByExpr(models.CygxArticleData{}, whereParam, updateParams)
-				if err != nil {
-					fmt.Println("UpdateByExpr CygxArticleData Err:" + err.Error())
-					return err
-				}
 			}
+			//} else {
+			//	updateParams := make(map[string]interface{})
+			//	updateParams["Cover"] = v.Cover
+			//	whereParam := map[string]interface{}{"article_id": v.ArticleId}
+			//	err = models.UpdateByExpr(models.CygxArticleData{}, whereParam, updateParams)
+			//	if err != nil {
+			//		fmt.Println("UpdateByExpr CygxArticleData Err:" + err.Error())
+			//		return err
+			//	}
+			//}
 		}
 	}
 	return err

services/report_billboard.go

@@ -12,7 +12,7 @@ import (
 func UpdateDailyMonthReadBillboard(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("查研观向-每日更新月阅读飙升榜单失败, ErrMsg: " + err.Error(), 3)
+			go utils.SendAlarmMsg("查研观向-每日更新月阅读飙升榜单失败, ErrMsg: "+err.Error(), 3)
 		}
 	}()
 
@@ -38,4 +38,4 @@ func UpdateDailyMonthReadBillboard(cont context.Context) (err error) {
 		return
 	}
 	return
-}
+}