Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_8.2

controllers/activity.go

@@ -2985,6 +2985,9 @@ func (this *ActivityCoAntroller) CheckAsk() {
 // @Param   ActivityTypeIds   query   string  false     "活动类型id 多个用 , 隔开"
 // @Param   ActiveState   query   string  false       "活动进行状态 未开始：1、进行中2、已结束3"
 // @Param   WhichDay   query   string  false       "哪一天 今天：1、明天:2，多个用 , 隔开"
+// @Param   WhichWeek   query   string  false       "哪一周 本周：1 上周：2"
+// @Param   WhichMonth   query   string  false       "哪一月 本月：1 上月：2"
+// @Param   WhichMonth   query   string  false       "哪一月 本月：1 上月：2"
 // @Param   IsPower   query   int  false       "是否选择有权限行业 ，1是 0 否 默认0"
 // @Success 200 {object} models.ActivityTypeListHomeResp
 // @router /labelTypeListV5 [get]

controllers/report.go

@@ -3063,6 +3063,7 @@ func (this *ReportController) StockNameList() {
 		br.ErrMsg = "获取综述报告公司名称失败,Err:" + err.Error()
 		return
 	}
+	var respList []*models.SummaryArticleStock
 	for _, item := range list {
 		sliceSubjects := strings.Split(item.Stock, "/")
 		if len(sliceSubjects) > 0 {
@@ -3076,13 +3077,16 @@ func (this *ReportController) StockNameList() {
 						ArticleId: item.ArticleId,
 						Stock:     subject,
 					}
-					list = append(list, &newItem)
+
+					respList = append(respList, &newItem)
 				} else {
 					item.Stock = subject
+					respList = append(respList, item)
 				}
 			}
 		}
 
+
 		//index := strings.Index(item.Stock, "(")
 		//item.Stock = item.Stock[:index]
 		//if strings.Contains(item.Stock, "-B"){
@@ -3093,7 +3097,7 @@ func (this *ReportController) StockNameList() {
 		//}
 	}
 	resp := new(models.SummaryArticleStockResp)
-	resp.List = list
+	resp.List = respList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/article.go

@@ -536,6 +536,7 @@ type ArticleResultApidate struct {
 	Field         ArticleField             `json:"field"`
 	Corpus        Corpus                   `json:"corpus"`
 	Cover         string                   `json:"cover"`
+	TypeId        int                      `json:"type_id"`
 }
 
 type ArticleField struct {
@@ -670,7 +671,7 @@ FROM
 WHERE
 	c.type_name = '综述报告' 
 	AND m.category_id = c.category_id_two 
-	AND m.chart_permission_id = ? ORDER BY last_updated_time DESC `
+	AND m.chart_permission_id = ? ORDER BY modify_time_by_cl DESC `
 
 	_, err = o.Raw(sql, chartPermissionId).QueryRows(&items)
 	return
@@ -678,4 +679,4 @@ WHERE
 
 type SummaryArticleStockResp struct {
 	List []*SummaryArticleStock
-}
+}

services/article.go

@@ -672,7 +672,7 @@ func GetArticleListByApi(cont context.Context) (err error) {
 }
 
 //func init() {
-//	HandleArticleListByApi(5978)
+//	HandleArticleListByApi(6005)
 //}
 
 //处理同步过来的文章
@@ -738,6 +738,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) {