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

models/activity_meet_detail_log.go

@@ -77,8 +77,7 @@ func GetActivityMeetDetailLog(mobileStr string) (item []*CygxActivityMeetDetailL
 	o := orm.NewOrm()
 	sql := `SELECT l.* 
 			FROM
-			cygx_activity_meet_detail_log  as l 
-			INNER JOIN wx_user as u ON u.outbound_mobile = l.mobile
+			cygx_activity_meet_detail_log  as l
 			WHERE l.mobile IN (` + mobileStr + `)  GROUP BY l.mobile `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return

models/activity_offline_meeting_detail.go

@@ -83,9 +83,9 @@ type CygxActivityOfflineMeetingDetailResp struct {
 // 预约外呼列表
 func GetOfflineMeetingListWithUser(condition string, pars []interface{}) (items []*CygxActivitySignupList, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT s.* , u.real_name
+	sql := `SELECT s.* 
 			FROM cygx_activity_offline_meeting_detail  as s 
-			INNER JOIN wx_user as u ON u.user_id = s.user_id  WHERE 1 =1 ` + condition
+			  WHERE 1 =1 ` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/activity_special_signup.go

@@ -29,14 +29,14 @@ type SignupSpecialStatus struct {
 	SignupStatus  int    `description:"返回状态：1：成功 、2 ：人数已满 、3：调研次数已用完、 4：超时"`
 }
 
-//添加
+// 添加
 func AddCygxActivitySpecialSignup(item *CygxActivitySpecialSignup) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Insert(item)
 	return
 }
 
-//获取某一用户的报名的数量
+// 获取某一用户的报名的数量
 func GetUserCygxActivitySpecialSignup(uid, activityId int) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_signup  WHERE  user_id=?  AND   activity_id =? `
 	o := orm.NewOrm()
@@ -44,7 +44,7 @@ func GetUserCygxActivitySpecialSignup(uid, activityId int) (count int, err error
 	return
 }
 
-//删除
+// 删除
 func DeleteCygxActivitySpecialSignup(uid, activityId int) (err error) {
 	o := orm.NewOrm()
 	sql := `DELETE  FROM cygx_activity_special_signup   WHERE   user_id=?   AND  activity_id=?    `
@@ -52,7 +52,7 @@ func DeleteCygxActivitySpecialSignup(uid, activityId int) (err error) {
 	return
 }
 
-//列表
+// 列表
 func GetActivityListSpecialAll(activityId int) (items []*CygxActivitySpecialSignup, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.*  FROM cygx_activity_special_signup as art WHERE 1= 1 AND  activity_id = ?  GROUP BY company_id`
@@ -60,7 +60,7 @@ func GetActivityListSpecialAll(activityId int) (items []*CygxActivitySpecialSign
 	return
 }
 
-//列表
+// 列表
 func GetActivityListSpecialByActivityId(activityId int) (items []*CygxActivitySpecialSignup, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.*  FROM cygx_activity_special_signup as art WHERE 1= 1 AND  activity_id = ? `
@@ -82,20 +82,20 @@ type CygxActivitySpecialSignupResp struct {
 	Count       string    `description:"所属销售"`
 }
 
-//列表
+// 列表
 func GetActivityListSpecialGroupByMobile(condition string, pars []interface{}) (items []*CygxActivitySpecialSignupResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT s.*,	COUNT( 1 ) AS count   FROM cygx_activity_special_signup as s INNER JOIN cygx_activity_special AS a ON a.activity_id = s.activity_id
-			INNER JOIN wx_user AS u ON u.user_id = s.user_id ` + condition + `  GROUP BY s.mobile`
+			` + condition + `  GROUP BY s.mobile`
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
-//列表
+// 列表
 func GetActivityListSpecialGroupByCompanyId(condition string, pars []interface{}) (items []*CygxActivitySpecialSignupResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT *,	COUNT( 1 ) AS count   FROM cygx_activity_special_signup   as s INNER JOIN cygx_activity_special AS a ON a.activity_id = s.activity_id
-			INNER JOIN wx_user AS u ON u.user_id = s.user_id ` + condition + `  GROUP BY s.company_id`
+			 ` + condition + `  GROUP BY s.company_id`
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/article.go

@@ -500,9 +500,9 @@ func GetArticleFollowDetail(articleId, uid int) (item *ArticleFollowDetail, err
 	//d_num 作者被关注的数量 、 md_num 本人是否关注这个作者 、ac_num 文章被收藏的数量 、 mac_num 本人是否收藏这个文章
 	o := orm.NewOrm()
 	sql := ` SELECT
-	( SELECT count( 1 ) FROM cygx_article_department_follow AS af INNER JOIN wx_user as u ON  u.user_id = af.user_id  WHERE af.department_id = art.department_id AND af.type = 1 ) AS d_num,
+	( SELECT count( 1 ) FROM cygx_article_department_follow AS af  WHERE af.department_id = art.department_id AND af.type = 1 ) AS d_num,
 	( SELECT count( 1 ) FROM cygx_article_department_follow AS af WHERE af.department_id = art.department_id AND af.type = 1 AND af.user_id = ? ) AS md_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 = art.article_id  ) AS ac_num,
+	( SELECT count( 1 ) FROM cygx_article_collect AS ac   WHERE ac.article_id = art.article_id  ) AS ac_num,
 	( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = art.article_id  AND ac.user_id = ? ) AS mac_num
 FROM
 	cygx_article AS art

models/article_collect.go

@@ -114,7 +114,6 @@ func GetUserArticleCollectList() (items []*CygxArticleCollectCountRep, err error
 			f.article_id 
 		FROM
 			cygx_article_collect AS f
-			INNER JOIN wx_user AS u ON u.user_id = f.user_id
 			INNER JOIN cygx_article AS a ON a.article_id = f.article_id 
 		WHERE
 			1 = 1 
@@ -151,8 +150,8 @@ func GetArticleCollectNum(articleId []string, uid int) (items []*CygxArticleNum,
 	sql := `SELECT
 			a.article_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  ) AS collect_num, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac   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 is_collect
 		FROM
 			cygx_article AS a WHERE  1 = 1  AND  article_id IN  (` + utils.GetOrmInReplace(lenarticleId) + `) `

models/industry_fllow.go

@@ -123,7 +123,6 @@ func GetUserFllowIndustrialList(userId int) (items []*CygxIndustryFllow, err err
 			m.industrial_management_id 
 		FROM
 			cygx_industry_fllow AS f
-			INNER JOIN wx_user AS u ON f.user_id = u.user_id
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = f.industrial_management_id 
 		WHERE
 			1 = 1 
@@ -145,7 +144,6 @@ func GetUserFllowIndustrialCountList() (items []*CygxIndustryFllowCountRep, err
 			f.industrial_management_id 
 		FROM
 			cygx_industry_fllow AS f
-			INNER JOIN wx_user AS u ON u.user_id = f.user_id 
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = f.industrial_management_id 
 		WHERE
 			1 = 1 

models/report.go

@@ -535,8 +535,8 @@ func GetReportCollectionBillboardListYx(limit int, pars []interface{}, condition
 			d.nick_name,
 			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 collection_num
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac   WHERE ac.article_id = a.article_id  ) AS collect_num, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac   WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collection_num
 		FROM
 			cygx_article AS a
 			INNER JOIN cygx_article_collect AS ac ON ac.article_id = a.article_id 
@@ -567,8 +567,8 @@ func GetArticleCollectionList(condition string, userId int) (items []*ArticleCol
 			d.nick_name,
 			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  ) AS collect_num, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac  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
@@ -977,9 +977,9 @@ func GetDepartmentDetail(userId, departmentId int, condition string) (item Depar
 			d.nick_name,
 			d.img_url,
 			( SELECT count( 1 ) FROM cygx_article_department_follow AS af WHERE af.user_id = ? AND af.department_id = d.department_id AND af.type= 1 ) AS my_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 ) AS fllow_num,
+			( SELECT count( 1 ) FROM cygx_article_department_follow AS f    WHERE f.department_id = d.department_id  AND f.type= 1 ) AS fllow_num,
 			( SELECT count( 1 ) FROM cygx_article AS a WHERE a.department_id = d.department_id ` + condition + `  ) AS article_num,
-			( SELECT count( 1 ) FROM cygx_article_collect  AS c INNER JOIN wx_user as u ON  u.user_id = c.user_id   WHERE c.article_id IN (SELECT  article_id FROM cygx_article AS a WHERE a.department_id = d.department_id  ` + condition + ` )) AS collect_num
+			( SELECT count( 1 ) FROM cygx_article_collect  AS c    WHERE c.article_id IN (SELECT  article_id FROM cygx_article AS a WHERE a.department_id = d.department_id  ` + condition + ` )) AS collect_num
 		FROM
 			cygx_article_department AS d 
 		WHERE