Merge branch 'cygx_check_table' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_12.0

models/activity.go

@@ -477,7 +477,6 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			cygx_activity AS art
 			INNER JOIN cygx_my_schedule AS my ON my.activity_id = art.activity_id
 			INNER JOIN cygx_activity_type AS t ON t.activity_type_id = art.activity_type_id
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = art.chart_permission_id 
 		WHERE
 			1 = 1 `
 	if condition != `` {
@@ -625,14 +624,12 @@ func GetActivitySendMsgListAll(endDate string) (items []*WxMsgCygxActivityList,
 FROM
 	cygx_activity AS a
 	INNER JOIN cygx_activity_signup AS s ON s.activity_id = a.activity_id
-	INNER   JOIN user_record AS c ON c.bind_account = s.mobile 
-	INNER JOIN cygx_user_record AS cr ON cr.union_id = c.union_id 
+	INNER JOIN cygx_user_record AS cr ON cr.cygx_bind_account = s.mobile 
 WHERE
 	1 = 1 
 	AND s.is_send_wx_msg = 0 
 	AND s.do_fail_type = 0 
-	AND a.publish_status = 1 
-	AND c.create_platform = 4
+	AND a.publish_status = 1
 	AND a.activity_time <= ? AND a.activity_time >= NOW() 
 	AND s.is_cancel = 0
 	AND( a.activity_type_id IN (4,5,6) OR (a.activity_type_id = 3 AND a.is_limit_people = 1 )) 	GROUP BY s.id`
@@ -1017,14 +1014,12 @@ func GetActivityWeekPermission() (permission string, err error) {
 func GetIndustrialActivityGroupManagementList(activityId int) (items []*IndustrialManagementRep, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			p.permission_name,
-			p.chart_permission_id,
+			m.chart_permission_id,
 			m.industrial_management_id,
 			m.industry_name 
 			FROM
 			cygx_industrial_activity_group_management AS am
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = am.industrial_management_id
-			INNER JOIN chart_permission AS p ON p.chart_permission_id = m.chart_permission_id 
 			WHERE
 			am.activity_id = ? AND am.source = 1`
 	_, err = o.Raw(sql, activityId).QueryRows(&items)

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/apply_record.go

@@ -88,6 +88,8 @@ func AddApplyRecord(item *CygxApplyRecord) (err error) {
 	if err != nil {
 		return
 	}
+
+	ow := orm.NewOrmUsingDB("weekly_report")
 	msql := `UPDATE  wx_user
 		SET
 		  note = ?,
@@ -96,7 +98,7 @@ func AddApplyRecord(item *CygxApplyRecord) (err error) {
           real_name=?,
 		  mobile=?
 		WHERE user_id = ? `
-	_, err = o.Raw(msql, item.CompanyName, item.ApplyMethod, item.RealName, item.Mobile, item.UserId).Exec()
+	_, err = ow.Raw(msql, item.CompanyName, item.ApplyMethod, item.RealName, item.Mobile, item.UserId).Exec()
 	return
 }
 

models/article.go

@@ -426,15 +426,6 @@ type ReportArticle struct {
 	Resource         int    `description:"来源类型，1：文章、2：产品内测"`
 }
 
-func GetReportPermission(categoryName string) (item []*ChartPermission, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT b.* FROM cygx_report_mapping AS a
-			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id
-			WHERE a.sub_category_name=? `
-	_, err = o.Raw(sql, categoryName).QueryRows(&item)
-	return
-}
-
 type ReportMappingCategoryRep struct {
 	CategoryId int `description:"文章分类id"`
 }
@@ -500,9 +491,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/company.go

@@ -180,7 +180,7 @@ func GetCompanyPermissionByName(name string) (permission string, err error) {
 			INNER JOIN company AS cm ON cm.company_id=c.company_id 
 			WHERE  cm.company_name=?
 			AND b.product_id = 2 `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, name).QueryRow(&permission)
 	return
 }

models/industrial_article_group_management.go

@@ -83,14 +83,12 @@ func GetIndustrialArticleGroupManagementList(condition string, pars []interface{
 func GetIndustrialArticleGroupManagementListByArticleId(articleId int) (items []*CygxIndustrialArticleGroupManagement, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			p.permission_name,
-			p.chart_permission_id,
+			m.chart_permission_id,
 			m.industrial_management_id,
 			m.industry_name 
 			FROM
 			cygx_industrial_article_group_management AS am
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = am.industrial_management_id
-			INNER JOIN chart_permission AS p ON p.chart_permission_id = m.chart_permission_id 
 			WHERE
 			am.article_id = ?`
 	_, err = o.Raw(sql, articleId).QueryRows(&items)

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/minutesSummary.go

@@ -82,10 +82,9 @@ func GetMinutesSummarylogListAllV4(articleId int) (items []*ResearchSummaryChart
 // 列表
 func GetMinutesSummarylogListAll(articleId int) (items []*MinutesSummaryChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,c.image_url,l.*
+	sql := `SELECT l.*
 			FROM
 			cygx_minutes_summary_log AS l
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			WHERE l.article_id = ? 
 			GROUP BY l.chart_permission_id
 			ORDER BY l.chart_permission_sort ASC   `

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
@@ -978,9 +978,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

models/user_record.go

@@ -90,17 +90,8 @@ func ModifyUserRecordSessionKey(openId, sessionKey string) (err error) {
 
 // 根据用户id和平台id获取用户关系
 func GetUserRecordByMobile(platform int, bindAccount string) (item *OpenIdList, err error) {
-
 	var sql string
-	if utils.RunMode == "release" {
-		sql = `SELECT cr.open_id,user_id FROM user_record  as u 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE create_platform=? AND bind_account = ?`
-	} else {
-		platform = 1
-		sql = `SELECT open_id,user_id FROM	user_record  WHERE create_platform =? AND bind_account = ?`
-	}
-
+	sql = `SELECT union_id,cygx_user_id AS user_id  FROM	cygx_user_record  WHERE	1 = 1  AND cygx_bind_account = ?`
 	err = orm.NewOrm().Raw(sql, platform, bindAccount).QueryRow(&item)
 	return
 }
@@ -130,7 +121,7 @@ func GetUserRecordListByMobile(platform int, bindAccount string) (items []*OpenI
 		FROM
 		  cygx_user_record  as cr 
 		WHERE 1= 1	AND cygx_bind_account IN (` + bindAccount + `)`
-	_, err = orm.NewOrm().Raw(sql, platform).QueryRows(&items)
+	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
 	return
 }
 

services/activity.go

@@ -32,7 +32,7 @@ func SendActivityBeginMsg(cont context.Context) (err error) {
 	//func SendActivityBeginMsg() (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("60分钟会议消息提醒失败", 2)
+			go utils.SendAlarmMsg("60分钟会议消息提醒失败"+err.Error(), 2)
 			fmt.Println("发送失败，Err:", err.Error())
 		}
 	}()