研选榜单排序规则修改

controllers/research.go

@@ -100,7 +100,7 @@ func (this *ResearchController) CollectionList() {
 		return
 	}
 	var condition string
-	condition = `  AND a.category_name LIKE '%` + categoryinfo.PermissionName + `%' AND publish_status = 1 GROUP BY a.article_id ORDER BY collect_num DESC, publish_date DESC LIMIT 15 `
+	condition = `  AND a.category_name LIKE '%` + categoryinfo.PermissionName + `%' AND publish_status = 1 GROUP BY a.article_id ORDER BY collect_num_order DESC, publish_date DESC LIMIT 15 `
 	list, err := models.GetArticleCollectionList(condition, user.UserId)
 	if err != nil {
 		br.Msg = "获取信息失败"

models/activity_attendance_detail.go

@@ -24,6 +24,7 @@ type CygxActivityAttendanceDetail struct {
 	Position              string    `description:"职位"`
 	IsMeetingStr          int       `description:"是否到会，1到会，0未到会"`
 	UseridEntity          int       `description:"参会者身份. 1:主讲人, 2:主持人, 3:嘉宾, 4:普通参会者, 5:联席主讲人, 6:会议助理"`
+	ActivityTime          string    `description:"活动时间"`
 }
 
 //添加会议提醒信息

models/activity_meet_detail_log.go

@@ -16,6 +16,7 @@ type CygxActivityMeetDetailLog struct {
 	CompanyName  string    `description:"公司名称"`
 	CompanyId    int       `description:"公司id 不在数据库的用户为0"`
 	CreateTime   time.Time `description:"创建时间"`
+	ActivityTime string    `description:"活动时间"`
 }
 
 func GetOfflineMeetingDetailListCompanyIdStr(companyIdStr string) (item []*CygxActivityMeetDetailLog, err error) {
@@ -197,6 +198,7 @@ func AddCygxActivityMeetDetailLogOnlineByList(list []*CygxActivityAttendanceDeta
 		fmt.Println(v.CompanyName)
 		item.CompanyName = v.CompanyName
 		item.CompanyId = v.CompanyId
+		item.ActivityTime = v.ActivityTime
 		item.CreateTime = v.CreateTime
 		if strings.Index(CompanyName, v.CompanyName) == -1 && v.CompanyName != "" {
 			CompanyName += "'" + v.CompanyName + "',"

models/industrial_management.go

@@ -291,7 +291,7 @@ func GetIndustrialManagementArtCount(industrialManagementId int) (count int, err
 	sqlCount := ` SELECT COUNT(1) AS count  
 	 			FROM  cygx_article_history_record AS h
 				INNER JOIN cygx_industrial_article_group_management as mg ON  mg.article_id = h.article_id
-				WHERE mg.industrial_management_id = ?`
+				WHERE mg.industrial_management_id = ?  AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( h.create_time ) `
 	o := orm.NewOrm()
 	err = o.Raw(sqlCount, industrialManagementId).QueryRow(&count)
 	return

models/report.go

@@ -343,6 +343,7 @@ func GetArticleCollectionList(condition string, userId int) (items []*ArticleCol
 			d.department_id,
 			( SELECT count( 1 ) FROM cygx_article_history_record_newpv AS h WHERE h.article_id = a.article_id ) AS pv,
 			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id  ) AS collect_num, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collect_num_order, 
 			( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id  AND user_id = ? ) AS my_collect_num
 		FROM
 			cygx_article AS a
@@ -386,7 +387,7 @@ func GetThemeHeatList(permissionName string, userId int, condition string, start
 			m.article_read_num,
           	MAX( a.publish_date ) AS publish_date,
 			( SELECT count( 1 ) FROM cygx_industry_fllow AS f  WHERE f.industrial_management_id = m.industrial_management_id  AND user_id =? AND f.type = 1  ) AS fllow_num,
-			m.article_read_num + ( SELECT count( 1 ) FROM cygx_activity_meet_detail_log AS la  WHERE la.activity_id  IN  (SELECT activity_id FROM cygx_industrial_activity_group_management WHERE industrial_management_id = m.industrial_management_id  )) AS sum_num
+			m.article_read_num + ( SELECT count( 1 ) FROM cygx_activity_meet_detail_log AS la  WHERE la.activity_id  IN  (SELECT activity_id FROM cygx_industrial_activity_group_management WHERE industrial_management_id = m.industrial_management_id  ) AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( la.activity_time ) ) AS sum_num
 		FROM
 			cygx_industrial_management AS m
 			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.industrial_management_id = m.industrial_management_id
@@ -469,7 +470,7 @@ func GetDepartmentList(permissionName string, userId int) (items []*DepartmentRe
 			d.department_id,
 			d.img_url,
 			( SELECT count( 1 ) FROM cygx_article_department_follow AS f  WHERE f.department_id = d.department_id  AND user_id =?  AND f.type= 1  ) AS fllow_num,
-			( SELECT count( 1 ) FROM cygx_article_department_follow  AS f INNER JOIN wx_user AS u ON u.user_id = f.user_id  WHERE f.department_id = d.department_id AND f.type= 1 ) +( SELECT count( 1 ) FROM cygx_article_collect AS ac INNER JOIN wx_user AS u ON u.user_id = ac.user_id  WHERE ac.article_id IN (SELECT article_id FROM cygx_article WHERE department_id = d.department_id )) AS sum_num
+			( SELECT count( 1 ) FROM cygx_article_department_follow  AS f INNER JOIN wx_user AS u ON u.user_id = f.user_id  WHERE f.department_id = d.department_id AND f.type= 1 ) +( SELECT count( 1 ) FROM cygx_article_collect AS ac INNER JOIN wx_user AS u ON u.user_id = ac.user_id  WHERE ac.article_id IN (SELECT article_id FROM cygx_article WHERE department_id = d.department_id ) 	AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS sum_num
 		FROM
 		cygx_article_department AS d
 			INNER JOIN cygx_article AS a ON d.department_id = a.department_id

models/user.go

@@ -155,7 +155,7 @@ func GetArticleUserCollectCount(userId int) (count int, err error) {
 
 func GetArticleUserCollectList(startSize, pageSize, userId int) (items []*ArticleCollectList, err error) {
 	sql := `SELECT a.* FROM cygx_article_collect AS a INNER JOIN cygx_article as art ON art.article_id = a.article_id
-			WHERE a.user_id=?  AND art.publish_status = 1  AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( a.create_time ) 
+			WHERE a.user_id=? 
            ORDER BY a.create_time DESC LIMIT ?,? `
 	_, err = orm.NewOrm().Raw(sql, userId, startSize, pageSize).QueryRows(&items)
 	return

services/activity.go

@@ -685,6 +685,7 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
 							}
 							item.Position = v.Occupation
 							item.UseridEntity = v.UseridEntity
+							item.ActivityTime = activityDetail.ActivityTime
 							item.CreateTime = time.Now()
 							mobileStr += "'" + v.UserPhone + "'" + ","
 							needAddAttendanc = append(needAddAttendanc, item)
@@ -794,6 +795,7 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
 							}
 							item.Position = v.Occupation
 							item.UseridEntity = v.UseridEntity
+							item.ActivityTime = vAct.ActivityTime
 							item.CreateTime = time.Now()
 							mobileStr += "'" + v.UserPhone + "'" + ","
 							needAddAttendanc = append(needAddAttendanc, item)