查研观向7.0bug处理

controllers/report_billboard.go

@@ -178,8 +178,8 @@ func (this *ReportBillboardController) ReadList() {
 		var articleTopIds string
 		conditionPv = condition
 		dateTime := time.Now().AddDate(0, 0, -15).Format(utils.FormatDate)
-		conditionPv += `  AND l.create_time > ?  `
-		pars = append(pars, dateTime)
+		conditionPv += `  AND l.create_time > ?   AND l.create_time <  ?  `
+		pars = append(pars, dateTime, time.Now().Format(utils.FormatDate))
 		listTop, err := models.GetCygxArticleHistoryAllTop(pars, conditionPv)
 		if err != nil {
 			br.Msg = "获取失败"

controllers/research.go

@@ -278,6 +278,7 @@ func (this *ResearchController) KolList() {
 // @Title 主题详情
 // @Description 主题详情接口
 // @Param   IndustrialManagementId   query   int  true       "分类ID"
+// @Param   Source   query   int  true       "来源 1：研选，2：报告 默认1"
 // @Success 200 {object} models.GetThemeDetailResp
 // @router /theme/detail [get]
 func (this *ResearchController) ThemeDetail() {
@@ -297,8 +298,19 @@ func (this *ResearchController) ThemeDetail() {
 		br.Msg = "请输入产业ID"
 		return
 	}
+	source, _ := this.GetInt("Source")
+	if source != 2 {
+		source = 1
+	}
+
+	var condition string
+	if source == 1 {
+		condition = `  AND a.category_name LIKE '%研选%' `
+	} else {
+		condition = `  AND a.category_name  NOT LIKE '%研选%' `
+	}
 	resp := new(models.GetThemeDetailResp)
-	list, err := models.GetThemeDetail(user.UserId, industrialManagementId)
+	list, err := models.GetThemeDetail(user.UserId, industrialManagementId, condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()

models/activity.go

@@ -491,8 +491,12 @@ type ActivityMsgExportRep struct {
 
 func GetSignupExport(activityId int) (item []*SignupExportRep, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT s.*  ,a.is_limit_people,u.real_name,
-			(SELECT p.seller_name from company_product as p WHERE p.company_id = u.company_id  AND  p.product_id = 2 )  AS seller_name
+	sql := ` SELECT  s.outbound_mobile,
+			s.country_code,
+			a.is_limit_people,
+			u.real_name,
+			( SELECT p.seller_name FROM company_product AS p WHERE p.company_id = u.company_id AND p.product_id = 2 ) AS seller_name,
+			( SELECT c.company_name FROM company AS c WHERE c.company_id = u.company_id  ) AS company_name
 			FROM
 			cygx_activity_signup AS s
 			LEFT JOIN wx_user AS u ON u.user_id = s.user_id

models/report.go

@@ -545,7 +545,7 @@ type GetThemeDetailResp struct {
 }
 
 //列表
-func GetThemeDetail(userId, industrialManagementId int) (items []*GetThemeDetailListResp, err error) {
+func GetThemeDetail(userId, industrialManagementId int, condition string) (items []*GetThemeDetailListResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 			a.article_id,
@@ -571,8 +571,7 @@ func GetThemeDetail(userId, industrialManagementId int) (items []*GetThemeDetail
 		WHERE
 			1 = 1
 			AND m.industrial_management_id = ? 
-			AND publish_status = 1 
-			AND a.category_name LIKE '%研选%' 
+			AND publish_status = 1 ` + condition + `
 		ORDER BY
 			publish_date DESC`
 	_, err = o.Raw(sql, userId, userId, industrialManagementId).QueryRows(&items)