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

models/activity.go

@@ -348,14 +348,13 @@ func GetActivityListAll(condition string, pars []interface{}, uid, startSize, pa
 		//sqlJiontable = ` INNER JOIN cygx_activity_voice AS ac ON ac.activity_id = art.activity_id `
 	}
 	o := orm.NewOrm()
-	sql := `SELECT art.* ,t.activity_type,t.img_url_text,c.image_url as  img_url,
+	sql := `SELECT art.* ,t.activity_type,t.img_url_text,
 		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ?   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS is_signup,
 		( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS signup_num,
 		( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.user_id = ?  AND m.is_cancel = 0  ) AS is_cancel_meeting_reminder,
 		( SELECT COUNT( 1 ) FROM cygx_activity_appointment AS ap WHERE ap.activity_id = art.activity_id AND ap.user_id = ? ) AS is_appointment
 		FROM cygx_activity as art
-		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 ` + sqlJiontable + ` WHERE 1= 1 `
+		INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id` + sqlJiontable + ` WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
 	}
@@ -429,7 +428,7 @@ func GetScheduleCount(condition string, uid int) (count int, err error) {
 // 我的日程列表
 func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*ActivityDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT art.*,t.activity_type,t.img_url_text,c.image_url as  img_url,
+	sql := `SELECT art.*,t.activity_type,t.img_url_text,
 			( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ? AND s.is_cancel = 0 AND s.do_fail_type = 0) AS is_signup,
             ( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND  s.is_cancel = 0  AND s.do_fail_type = 0) AS signup_num ,
 			( SELECT COUNT( 1 ) FROM cygx_activity_appointment AS ap WHERE ap.activity_id = art.activity_id AND ap.user_id = ? ) AS is_appointment,
@@ -437,7 +436,6 @@ func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageS
             FROM 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 AND my.user_id = ? `
 	if condition != "" {
 		sql += condition
@@ -953,7 +951,6 @@ func GetCygxActivitySpecialDetailList(condition string, pars []interface{}, uid,
 	o := orm.NewOrm()
 	sql := ` SELECT
 	art.*,
-	c.image_url AS img_url,
 	(
 	SELECT
 		COUNT( 1 ) 
@@ -965,7 +962,6 @@ func GetCygxActivitySpecialDetailList(condition string, pars []interface{}, uid,
 	) AS is_signup
 FROM
 	cygx_activity_special AS art
-	INNER JOIN chart_permission AS c ON c.chart_permission_id = art.chart_permission_id 
 WHERE
 	1 = 1 `
 	if condition != "" {
@@ -1201,14 +1197,13 @@ func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pa
 	}
 
 	o := orm.NewOrm()
-	sql := `SELECT art.* ,t.activity_type,t.img_url_text,c.image_url as  img_url,t.img_url_bg_yx,
+	sql := `SELECT art.* ,t.activity_type,t.img_url_text,t.img_url_bg_yx,
 		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ?   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS is_signup,
 		( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS signup_num,
 		( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.user_id = ?  AND m.is_cancel = 0  ) AS is_cancel_meeting_reminder,
 		( SELECT COUNT( 1 ) FROM cygx_activity_appointment AS ap WHERE ap.activity_id = art.activity_id AND ap.user_id = ? ) AS is_appointment
 		FROM cygx_activity as art
-		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 ` + sqlJiontable + ` WHERE 1= 1 `
+		INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id ` + sqlJiontable + ` WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
 	}
@@ -1238,8 +1233,7 @@ func GetActivityListHomeNew(condition string, startSize, pageSize int) (items []
 	o := orm.NewOrm()
 	sql := `SELECT activity_id
 		FROM cygx_activity as art
-		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 `
+		INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
 	}

models/chart_permission.go

@@ -22,7 +22,7 @@ type ChartPermissionResp struct {
 }
 
 func GetChartPermissionAll(condition string) (items []*ChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1  AND permission_type!=2  ` + condition + ` ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -39,21 +39,21 @@ func GetCategoryId(chartPermissionId int) (category_id string, err error) {
 }
 
 func GetChartPermissionReportAll(condition string) (items []*ChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND is_report=1 AND permission_type!=2 ` + condition + ` ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 func GetChartPermissionById(chartPermissionId int) (item *ChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ? `
 	err = o.Raw(sql, chartPermissionId).QueryRow(&item)
 	return
 }
 
 func GetChartPermissionActivity() (items []*ActivityChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id IN (19,20,21,22,23,31) ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -86,7 +86,7 @@ func GetUserCompanyPermission(companyId int) (items []*ActivityChartPermission,
 			AND b.chart_permission_name IN (` + chartPermissionName + `)
 			GROUP BY b.chart_permission_name
 			ORDER BY b.sort ASC `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -106,45 +106,39 @@ func GetUserCompanyPermissionSandO(companyId int) (items []*ActivityChartPermiss
 			AND b.chart_permission_name != '专家'
 			GROUP BY b.chart_permission_name
 			ORDER BY b.sort ASC `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	_, err = o.Raw(sql, companyId).QueryRows(&items)
 	return
 }
 
 // 获取策略下面的所有分类
 func GetCompanyReportPermissionAll() (items []*CompanyReportPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM company_report_permission WHERE chart_permission_id IN (19,20,21,22) AND status IN ('正式','试用','永续')  AND created_time <= '2021-12-28 15:05:43'`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
-func AddChartPersion(item *CompanyReportPermission) (newId int64, err error) {
-	o := orm.NewOrm()
-	newId, err = o.Insert(item)
-	return
-}
-
 // 获取海通国际开通的默认权限
 func GetCompanyPermissionIdWithHtgj() (chartpermissionids string, err error) {
 	sql := ` SELECT GROUP_CONCAT(DISTINCT chart_permission_id  ORDER BY b.sort ASC  SEPARATOR ',') AS chartpermissionids
 			FROM chart_permission as  b 
 			WHERE chart_permission_name IN ('医药','消费','科技','智造','买方研选')`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql).QueryRow(&chartpermissionids)
 	return
 }
 
 // GetChartPermissionById 主键获取权限
 func GetChartPermissionByRemark(remark string) (item *ChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM chart_permission WHERE remark = ? LIMIT 1`
 	err = o.Raw(sql, remark).QueryRow(&item)
 	return
 }
 
 func GetChartPermissionIdByName(condition string, pars []interface{}) (chartpermissionids string, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT GROUP_CONCAT(DISTINCT chart_permission_id   SEPARATOR ',') AS chartpermissionids FROM chart_permission  WHERE product_id=2  ` + condition
 	err = o.Raw(sql, pars).QueryRow(&chartpermissionids)
 	return

models/report.go

@@ -636,14 +636,14 @@ func GetArticleResearchList(condition string, pars []interface{}, startSize, pag
 			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,
 			0 AS is_special,
 			0 AS special_type,
 			0 AS user_id,
 			'' AS company_tags, 
-			'' AS industry_tags 
+			'' AS industry_tags
 		FROM
 			cygx_article AS a
 			INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id