no message

controllers/cygx/advice.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 )
 
-//优化建议
+// 优化建议
 type AdviceController struct {
 	controllers.BaseAuthController
 }
@@ -55,7 +55,7 @@ func (this *AdviceController) List() {
 	var pars []interface{}
 
 	if keyWord != "" {
-		condition += ` AND (b.mobile LIKE '%` + keyWord + `%' OR b.email LIKE '%` + keyWord + `%' OR b.real_name LIKE '%` + keyWord + `%') `
+		condition += ` AND (a.mobile LIKE '%` + keyWord + `%' OR a.email LIKE '%` + keyWord + `%' OR a.user_real_name LIKE '%` + keyWord + `%') `
 	}
 
 	total, err := cygx.GetAdviceListCount(condition, pars)

controllers/cygx/apply_record.go

@@ -53,7 +53,8 @@ func (this *ApplyRecordController) ListSysRole() {
 	var pars []interface{}
 
 	if keyWord != "" {
-		condition += ` AND (b.seller_name LIKE '%` + keyWord + `%' OR a.mobile LIKE '%` + keyWord + `%' OR c.email LIKE '%` + keyWord + `%' )  `
+		//condition += ` AND (b.seller_name LIKE '%` + keyWord + `%' OR a.mobile LIKE '%` + keyWord + `%' OR c.email LIKE '%` + keyWord + `%' )  `
+		condition += ` AND a.mobile LIKE '%` + keyWord + `%'  `
 	}
 
 	customType, _ := this.GetInt("CustomType")

controllers/cygx/industrial_subject.go

@@ -464,7 +464,7 @@ func (this *IndustrialSubjectController) IndustrialSubjectSearch() {
 		condition = ` AND s.subject_name LIKE '%` + keyWord + `%'  `
 	}
 	if chartPermissionId > 0 {
-		condition += ` AND c.chart_permission_id = ` + strconv.Itoa(chartPermissionId)
+		condition += ` AND m.chart_permission_id = ` + strconv.Itoa(chartPermissionId)
 	}
 
 	listSubject, err := cygx.GetIndustrialSubjectListNameByChartId(condition)

controllers/cygx/user.go

@@ -993,7 +993,7 @@ func (this *UserController) TableDetail() {
 			return
 		}
 	} else if source == 8 {
-		condition += ` 	AND u.user_id = ? `
+		condition += ` 	AND h.user_id = ? `
 		pars = append(pars, userId)
 		total, err = cygx.GetCygxActivitySpecialTripCount(condition, pars)
 		if err != nil {

models/cygx/activity.go

@@ -25,7 +25,7 @@ type ActivityList struct {
 
 // 列表
 func GetActivityList() (items []*ActivityType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_type ORDER BY sort DESC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -45,7 +45,7 @@ type ActivityCcustomerTypeList struct {
 
 // 列表
 func GetActivityCcustomerTypeList(condition string) (items []*ActivityCcustomerType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_customer_type WHERE  1= 1 `
 	if condition != "" {
 		sql += condition
@@ -255,7 +255,7 @@ type CygxActivityEditDetail struct {
 
 // 添加活动
 func AddActivity(items []*CygxActivity, industrialActivityItems [][]*CygxIndustrialActivityGroupManagement, subjectActivityItems [][]*CygxIndustrialActivityGroupSubject, itemPointsSet *CygxActivityPointsSet) (newId int64, activityIdArr []int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -322,7 +322,7 @@ func AddActivity(items []*CygxActivity, industrialActivityItems [][]*CygxIndustr
 
 // 通过纪要ID获取活动详情
 func GetAddActivityInfoById(ActivityId int) (item *ActivityDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.*,t.permission_type
 		FROM
@@ -336,7 +336,7 @@ func GetAddActivityInfoById(ActivityId int) (item *ActivityDetail, err error) {
 
 // 修改
 func EditActivity(item *CygxActivity, oldPublishStatus int, industrialActivityItems [][]*CygxIndustrialActivityGroupManagement, subjectActivityItems [][]*CygxIndustrialActivityGroupSubject, itemPointsSet *CygxActivityPointsSet) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -462,40 +462,6 @@ func EditActivity(item *CygxActivity, oldPublishStatus int, industrialActivityIt
 		}
 	}
 
-	//音频处理
-	//删除旧的音频
-	//sql = "DELETE FROM cygx_activity_voice WHERE activity_id=?"
-	//_, err = to.Raw(sql, activityId).Exec()
-	////插入新的音频
-	////if len(itemVoiceList) > 0 {
-	////	voiceId, err := to.InsertMulti(len(itemVoiceList), itemVoiceList)
-	////	if err != nil {
-	////		return
-	////	}
-	////}
-	//if itemVoice != nil {
-	//	if itemVoice.VoiceUrl != "" {
-	//		voiceId, err = to.Insert(itemVoice)
-	//		if err != nil {
-	//			return
-	//		}
-	//	}
-	//}
-	//
-	////视频处理
-	////删除旧的视频
-	//sql = "DELETE FROM cygx_activity_video WHERE activity_id=?"
-	//_, err = to.Raw(sql, activityId).Exec()
-	////插入新的音频
-	//if itemVideo != nil {
-	//	if itemVideo.VideoUrl != "" {
-	//		videoId, err = to.Insert(itemVideo)
-	//		if err != nil {
-	//			return
-	//		}
-	//	}
-	//}
-
 	{
 		//处理研选扣点子表
 		if itemPointsSet.PointsObject == "" {
@@ -547,7 +513,7 @@ func EditActivity(item *CygxActivity, oldPublishStatus int, industrialActivityIt
 
 // 修改
 func EditActivityStatus(activityId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -610,7 +576,7 @@ type GetCygxActivityListRep struct {
 
 // 列表
 func GetActivityListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -626,14 +592,14 @@ func GetActivityCount(condition string, pars []interface{}) (count int, err erro
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 获取数量
 func GetActivityCountById(activityId int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `SELECT COUNT(1) AS count  FROM cygx_activity WHERE activity_id = ?`
 	err = o.Raw(sqlCount, activityId).QueryRow(&count)
 	return
@@ -641,7 +607,7 @@ func GetActivityCountById(activityId int) (count int, err error) {
 
 // 修改发布状态
 func ActivityPublishAndCancel(item *CygxActivity) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -660,32 +626,12 @@ func ActivityPublishAndCancel(item *CygxActivity) (err error) {
 	if err != nil {
 		return
 	}
-	//if item.PublishStatus == 0 {
-	//	//删除报名信息
-	//	sql = ` DELETE FROM cygx_activity_signup WHERE activity_id = ?`
-	//	_, err = to.Raw(sql, activityId).Exec()
-	//	if err != nil {
-	//		return
-	//	}
-	//	//删除会议提醒信息
-	//	sql = ` DELETE FROM cygx_activity_meeting_reminder WHERE activity_id = ?`
-	//	_, err = to.Raw(sql, activityId).Exec()
-	//	if err != nil {
-	//		return
-	//	}
-	//	//删除我的日程信息
-	//	sql = ` DELETE FROM cygx_my_schedule WHERE activity_id = ?`
-	//	_, err = to.Raw(sql, activityId).Exec()
-	//	if err != nil {
-	//		return
-	//	}
-	//}
 	return
 }
 
 // 删除数据
 func DeleteActivity(activityId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_activity WHERE activity_id = ?`
 	_, err = o.Raw(sql, activityId).Exec()
 	return
@@ -693,7 +639,7 @@ func DeleteActivity(activityId int) (err error) {
 
 // 更新手动匹配的活动匹配关键词，建立匹配关系
 func UpdateActivityRoadshowTitle(activityId int, roadshowTitle, roadshowId string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` UPDATE cygx_activity SET  jmcj_roadshow_title=?,jmcj_activity_id=?   WHERE activity_id=?`
 	_, err = o.Raw(sql, roadshowTitle, roadshowId, activityId).Exec()
 	return
@@ -701,7 +647,7 @@ func UpdateActivityRoadshowTitle(activityId int, roadshowTitle, roadshowId strin
 
 // 列表
 func GetArticleListByCategoryId(categoryIds, industrialSubjectIdS string) (items []*CygxArticle, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 				* 
 			FROM
@@ -728,7 +674,7 @@ func GetactivityIdsByLabel(name string) (activityIds string, err error) {
 				cygx_activity AS s 
 			WHERE
 				label LIKE '%` + name + `%' `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql).QueryRow(&activityIds)
 	return
 }
@@ -736,7 +682,7 @@ func GetactivityIdsByLabel(name string) (activityIds string, err error) {
 // 根据易董的建会信息，修改腾讯参会信息
 func UpdateCygxActivityTencentConferenceNumber(item *ActivityDetail) (err error) {
 	sql := `UPDATE cygx_activity SET  tencent_conference_number=?,yidong_activity_id_by_cygx=?, body = ?  WHERE activity_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, item.TencentConferenceNumber, item.YidongActivityIdByCygx, item.Body, item.ActivityId).Exec()
 	return
 }
@@ -744,7 +690,7 @@ func UpdateCygxActivityTencentConferenceNumber(item *ActivityDetail) (err error)
 // 添加场所码
 func UpdateCygxActivitySigninImg(signinImg string, activityId int) (err error) {
 	sql := `UPDATE cygx_activity SET  signin_img=?  WHERE activity_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, signinImg, activityId).Exec()
 	return
 }

models/cygx/activity_appointment.go

@@ -3,7 +3,6 @@ package cygx
 import (
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-	"hongze/hz_crm_api/utils"
 	"time"
 )
 
@@ -24,7 +23,7 @@ type CygxActivityAppointment struct {
 
 // 取消纪要预约
 func CancelcygxActivityAppointment(item *CygxActivityAppointment) (lastId int64, err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("hz_cygx").Begin()
 	if err != nil {
 		return
 	}
@@ -64,16 +63,11 @@ func CancelcygxActivityAppointment(item *CygxActivityAppointment) (lastId int64,
 
 // 预约纪要的人数列表
 func GetCygxAppointmentSummaryList(activityId int, sqlStr string) (item []*CygxAppointmentList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT s.id,s.activity_id,s.user_id,s.create_time,s.mobile,s.company_id ,u.real_name,c.company_name,a.activity_time,
-			(SELECT p.seller_name from company_product as p WHERE p.company_id = u.company_id  AND  p.product_id = 2 )  AS seller_name,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT s.*,a.activity_time
 			FROM
 			cygx_activity_appointment AS s
-			INNER JOIN wx_user AS u ON  u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
-			LEFT JOIN company AS c ON c.company_id = u.company_id 
 			WHERE a.activity_id = ?  ` + sqlStr + `  GROUP BY s.user_id   ORDER BY s.create_time DESC `
 	_, err = o.Raw(sql, activityId).QueryRows(&item)
 	return
@@ -81,12 +75,10 @@ func GetCygxAppointmentSummaryList(activityId int, sqlStr string) (item []*CygxA
 
 // 预约纪要的人数数量
 func GetCygxAppointmentSummaryCount(activityId int, sqlStr string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(*) FROM
 			cygx_activity_appointment AS s
-			INNER  JOIN wx_user AS u ON  u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
 			WHERE
 			s.activity_id = ? ` + sqlStr + `
             GROUP BY s.user_id)`
@@ -97,7 +89,7 @@ func GetCygxAppointmentSummaryCount(activityId int, sqlStr string) (count int, e
 
 // 通过ID获取预约纪要详情
 func GetCygxAppointmentSummaryInfoById(id int) (item *CygxActivityAppointment, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_appointment  WHERE id=?`
 	err = o.Raw(sql, id).QueryRow(&item)
 	return
@@ -106,14 +98,14 @@ func GetCygxAppointmentSummaryInfoById(id int) (item *CygxActivityAppointment, e
 // 获取某一用户的报名的数量
 func GetUserCygxActivityAppointmentCount(uid, activityId int) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_appointment  WHERE  user_id=?  AND   activity_id =? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, uid, activityId).QueryRow(&count)
 	return
 }
 
 // 添加预约纪要
 func AddCygxActivityAppointmentUser(items []*CygxActivityAppointment) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -167,7 +159,7 @@ type CygxAppointmentMobileList struct {
 
 // 通过活动ID获取预约纪要的人数列表
 func GetCygxAppointmentSummaryListBySubjectId(subjectIds string) (item []*CygxAppointmentMobileList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			ap.mobile,
 			ap.activity_id,
@@ -191,30 +183,17 @@ func GetCygxAppointmentSummaryListBySubjectId(subjectIds string) (item []*CygxAp
 
 // 获取预约活动纪要的的用户的openID
 func GetActivityAppointmentOpenIdList(activityId int) (items []*OpenIdList, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	var sql string
-	if utils.RunMode == "release" {
-		sql = `SELECT DISTINCT cr.open_id,u.user_id
+	sql = `SELECT DISTINCT
+				u.open_id,
+				u.cygx_user_id AS user_id 
 			FROM
-			cygx_activity_appointment AS m
-			INNER JOIN user_record AS u ON u.bind_account = m.mobile 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE m.activity_id = ? AND u.create_platform = 4 `
-	} else {
-		sql = `SELECT
-			u.open_id,
-			u.user_id 
-		FROM
-			cygx_activity_appointment AS s
-			INNER JOIN wx_user AS wx ON wx.user_id = s.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
-			INNER JOIN company_product AS p ON p.company_id = wx.company_id 
-		WHERE
-			s.activity_id = ? 
-			AND u.create_platform = 1 
-			AND p.STATUS IN ( '正式', '试用', '永续' ) 
-		GROUP BY
-			u.open_id`
-	}
-	_, err = orm.NewOrm().Raw(sql, activityId).QueryRows(&items)
+				cygx_activity_appointment AS m
+				INNER JOIN cygx_user_record AS u ON u.cygx_bind_account = m.mobile 
+				AND u.cygx_user_id = m.user_id 
+			WHERE
+				m.activity_id < ? `
+	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }

models/cygx/activity_ask_email.go

@@ -11,7 +11,7 @@ type AskEmailRep struct {
 }
 
 func GetAskEmail() (item []*AskEmailRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_ask_email`
 	_, err = o.Raw(sql).QueryRows(&item)
 	return

models/cygx/activity_attendance_detail.go

@@ -54,7 +54,7 @@ type AttendanceDetail struct {
 }
 
 func AddAttendancDetail(items []*CygxActivityAttendanceDetail, activityId int, mobileStr string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -106,7 +106,7 @@ func AddAttendancDetail(items []*CygxActivityAttendanceDetail, activityId int, m
 }
 
 func GetAttendanceDetailList(activityId int, sqlStr string) (item []*AttendanceDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT s.id,s.activity_id,p.company_name,s.mobile,s.is_meeting,s.outbound_mobile,s.country_code,u.real_name,d.first_meeting_time,d.last_meeting_time,d.meeting_type_str,d.meeting_authentication,d.meeting_status_str,d.duration,d.userid_entity,
 			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name
 			FROM
@@ -126,14 +126,11 @@ func GetAttendanceDetailList(activityId int, sqlStr string) (item []*AttendanceD
 }
 
 func GetAttendanceDetailListGroup(activityId int, sqlStr string) (item []*AttendanceDetail, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT s.id,s.activity_id,p.company_name,s.mobile,s.is_meeting,s.outbound_mobile,s.country_code,s.real_name,d.first_meeting_time,d.last_meeting_time,d.meeting_type_str,d.meeting_authentication,d.meeting_status_str,d.duration,d.userid_entity,d.userid_entity,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT s.*,d.first_meeting_time,d.last_meeting_time,d.meeting_type_str,d.meeting_authentication,d.meeting_status_str,d.duration,d.userid_entity,d.userid_entity
 			FROM
 			cygx_activity_signup AS s
-			INNER  JOIN wx_user AS u ON u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = s.company_id 
 			LEFT JOIN cygx_activity_attendance_detail AS d ON ( d.mobile = s.outbound_mobile   OR d.mobile = s.mobile )  AND s.activity_id = d.activity_id
 			WHERE 1 = 1 
 			AND s.do_fail_type = 0 
@@ -144,13 +141,11 @@ func GetAttendanceDetailListGroup(activityId int, sqlStr string) (item []*Attend
 }
 
 func GetAttendanceDetailListGroupByUser(mobile, sqlStr string) (item []*AttendanceDetail, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT s.id,s.activity_id,p.company_name,s.mobile,s.is_meeting,s.outbound_mobile,s.country_code,s.real_name,s.first_meeting_time,s.last_meeting_time,s.meeting_type_str,s.meeting_authentication,s.meeting_status_str,s.duration,s.userid_entity,s.userid_entity,a.activity_name,a.activity_time_text
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT s.id,s.activity_id,s.company_name,s.mobile,s.is_meeting,s.outbound_mobile,s.country_code,s.real_name,s.first_meeting_time,s.last_meeting_time,s.meeting_type_str,s.meeting_authentication,s.meeting_status_str,s.duration,s.userid_entity,s.userid_entity,a.activity_name,a.activity_time_text
 			FROM
 			cygx_activity_signup_detail AS s
-			INNER  JOIN wx_user AS u ON u.mobile = s.mobile
 			INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = s.company_id
 			WHERE 1 = 1 
 			AND s.do_fail_type = 0 
 			AND s.is_cancel = 0
@@ -160,28 +155,21 @@ func GetAttendanceDetailListGroupByUser(mobile, sqlStr string) (item []*Attendan
 }
 
 func GetAttendanceDetailList2(activityId int, sqlStr string) (item []*AttendanceDetail, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT u.user_id,d.activity_id,u.real_name,u.company_id,d.first_meeting_time,d.last_meeting_time,d.meeting_type_str,d.meeting_authentication,d.meeting_status_str,d.mobile,d.duration,p.company_name,d.position,d.userid_entity,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name 
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT d.activity_id,d.real_name,d.company_id,d.first_meeting_time,d.last_meeting_time,d.meeting_type_str,d.meeting_authentication,d.meeting_status_str,d.mobile,d.duration,d.company_name,d.position,d.userid_entity
 			FROM
 			cygx_activity_attendance_detail AS d
-			INNER JOIN wx_user AS u ON u.mobile = d.mobile
-			INNER JOIN company_product AS p ON p.company_id = u.company_id 
 			WHERE 1 = 1 AND d.activity_id = ? AND is_meeting_str = 1 AND d.userid_entity != 3 AND u.mobile != '' ` + sqlStr + ` GROUP BY d.mobile`
 	_, err = o.Raw(sql, activityId).QueryRows(&item)
 	return
 }
 
 func GetAttendanceDetailList3(activityId int, sqlStr string) (item []*AttendanceDetail, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT u.user_id,d.activity_id,d.real_name,u.company_id,d.first_meeting_time,d.last_meeting_time,d.meeting_type_str,d.meeting_authentication,d.meeting_status_str,d.mobile,d.duration,d.company_name,d.position,d.userid_entity,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name 
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT d.activity_id,d.real_name,d.company_id,d.first_meeting_time,d.last_meeting_time,d.meeting_type_str,d.meeting_authentication,d.meeting_status_str,d.mobile,d.duration,d.company_name,d.position,d.userid_entity
 			FROM
 			cygx_activity_attendance_detail AS d
-			LEFT  JOIN wx_user AS u ON u.mobile = d.mobile
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id
 			WHERE 1 = 1 AND d.activity_id = ?  AND d.userid_entity != 3 AND d.crm_company_map_status_id != 1 ` + sqlStr + ` GROUP BY d.mobile`
-	//fmt.Println(sql)
 	_, err = o.Raw(sql, activityId).QueryRows(&item)
 	return
 }
@@ -292,7 +280,7 @@ type CompanyMeetRep struct {
 }
 
 func GetCygxActivityAttendanceDetailByCompanyId(mobiles string) (list []*CompanyMeetRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.*,
 			s.mobile,
@@ -325,7 +313,7 @@ func GetCygxActivityAttendanceDetailByCompanyId(mobiles string) (list []*Company
 }
 
 func GetCygxActivityOfflineMeetingDetailByCompanyId(mobiles string) (list []*CompanyMeetRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.*,s.mobile,s.email,s.real_name
 		FROM
@@ -349,7 +337,7 @@ func GetCygxActivityOfflineMeetingDetailByCompanyId(mobiles string) (list []*Com
 }
 
 func GetCompanyActivityCount(companyId int) (list []*CompanyMeetRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.chart_permission_name,
 			date_format( a.activity_time, '%Y-%m' ) AS activity_time
@@ -366,7 +354,7 @@ func GetCompanyActivityCount(companyId int) (list []*CompanyMeetRep, err error)
 }
 
 func GetCygxActivityOfflineMeetingCoount(companyId int) (list []*CompanyMeetRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.chart_permission_name,
 			date_format( a.activity_time, '%Y-%m' ) AS activity_time
@@ -381,7 +369,7 @@ func GetCygxActivityOfflineMeetingCoount(companyId int) (list []*CompanyMeetRep,
 
 // 列表
 func GetCygxActivityAttendanceDetailList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityAttendanceDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_attendance_detail as a WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

models/cygx/activity_fastsearch_keywords.go

@@ -27,9 +27,9 @@ type ActivityFastsearchKeywordsListResp struct {
 	List []*ActivityFastsearchKeywordsResp
 }
 
-//列表
+// 列表
 func GetActivityFastsearchKeywordsList() (items []*ActivityFastsearchKeywordsResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT f.*,
 			GROUP_CONCAT( DISTINCT m.key_word SEPARATOR ',' ) AS mirror_word 
 			FROM

models/cygx/activity_help_ask.go

@@ -2,7 +2,6 @@ package cygx
 
 import (
 	"github.com/beego/beego/v2/client/orm"
-	"hongze/hz_crm_api/utils"
 )
 
 type ActivityHelpAsk struct {
@@ -22,10 +21,9 @@ type ActivityHelpAskListResp struct {
 
 // 列表
 func GetActivityHelpAskList(activityId int) (items []*ActivityHelpAsk, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT k.*,u.real_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT k.*
 			FROM cygx_activity_help_ask  as k
-			INNER JOIN wx_user as u ON u.mobile = k.mobile
 			WHERE activity_id = ? ORDER BY create_time DESC`
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
@@ -33,30 +31,17 @@ func GetActivityHelpAskList(activityId int) (items []*ActivityHelpAsk, err error
 
 // 获取活动带问的用户的openID
 func GetActivityHelpAskOpenIdList(activityId int) (items []*OpenIdList, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	var sql string
-	if utils.RunMode == "release" {
-		sql = `SELECT DISTINCT cr.open_id,u.user_id
+	sql = `SELECT DISTINCT
+				u.open_id,
+				u.cygx_user_id AS user_id 
 			FROM
-			cygx_activity_help_ask AS m
-			INNER JOIN user_record AS u ON u.bind_account = m.mobile 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE m.activity_id = ? AND u.create_platform = 4 `
-	} else {
-		sql = `SELECT
-			u.open_id,
-			u.user_id 
-		FROM
-			cygx_activity_help_ask AS s
-			INNER JOIN wx_user AS wx ON wx.user_id = s.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
-			INNER JOIN company_product AS p ON p.company_id = wx.company_id 
-		WHERE
-			s.activity_id = ? 
-			AND u.create_platform = 1 
-			AND p.STATUS IN ( '正式', '试用', '永续' ) 
-		GROUP BY
-			u.open_id`
-	}
-	_, err = orm.NewOrm().Raw(sql, activityId).QueryRows(&items)
+				cygx_activity_help_ask AS m
+				INNER JOIN cygx_user_record AS u ON u.cygx_bind_account = m.mobile 
+				AND u.cygx_user_id = m.user_id 
+			WHERE
+				m.activity_id < ? `
+	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }

models/cygx/activity_meet.go

@@ -1,7 +1,6 @@
 package cygx
 
 import (
-	"fmt"
 	"hongze/hz_crm_api/utils"
 
 	//"hongze/hz_crm_api/models"
@@ -52,17 +51,17 @@ func GetCygxMeetCount(condition string, pars []interface{}) (count int, err erro
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxMeetListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxMeetList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT 
-		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s INNER JOIN wx_user as u ON  u.user_id = s.user_id   WHERE s.activity_id = a.activity_id AND s.is_cancel = 0 AND s.do_fail_type = 0 AND  s.company_id != 16 ) AS signup_people_num,
-		( SELECT COUNT( 1 ) FROM cygx_activity_signin AS s INNER JOIN wx_user as u ON  u.user_id = s.user_id   WHERE s.activity_id = a.activity_id AND s.company_id <= 1  ) AS potential_people_num,
+		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s    WHERE s.activity_id = a.activity_id AND s.is_cancel = 0 AND s.do_fail_type = 0 AND  s.company_id != 16 ) AS signup_people_num,
+		( SELECT COUNT( 1 ) FROM cygx_activity_signin AS s   WHERE s.activity_id = a.activity_id AND s.company_id <= 1  ) AS potential_people_num,
 	    ( SELECT COUNT( DISTINCT d.mobile  ) FROM cygx_activity_attendance_detail  AS d  WHERE d.activity_id = a.activity_id  AND( is_meeting_str = 1 or d.company_id <= 1) ) AS meet_people_num,
 	    ( SELECT COUNT( 1 ) FROM cygx_activity_offline_meeting_detail AS o WHERE o.activity_id = a.activity_id AND is_meeting = 1  ) AS omeet_people_num,
 		a.*
@@ -88,14 +87,6 @@ type CygxActivityMeet struct {
 	Source      int       `description:"来源，1小程序，2后台添加"`
 }
 
-// 获取用户报名数量
-func GetActivityMeetCount(uid, activityId int) (count int, err error) {
-	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_signup WHERE is_cancel=0  AND activity_id=? `
-	o := orm.NewOrm()
-	err = o.Raw(sqlCount, uid, activityId).QueryRow(&count)
-	return
-}
-
 // 报名信息Excel下载
 type MeetExportRep struct {
 	Mobile      string `description:"手机号"`
@@ -115,20 +106,18 @@ type SignUpRestrictUid struct {
 
 // 到会操作
 func MeetingDo(meetingUids, noMeetingUids string, ActivityId int, items []*CygxActivityOfflineMeetingDetail) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
 	}
 	defer func() {
 		if err != nil {
-			fmt.Println(err)
 			_ = to.Rollback()
 		} else {
 			_ = to.Commit()
 		}
 	}()
-	fmt.Println("ActivityId", ActivityId)
 	//修改报名表的参会记录
 	sql := `UPDATE cygx_activity_signup SET is_meeting = 0  WHERE activity_id =? `
 	_, err = to.Raw(sql, ActivityId).Exec()
@@ -180,10 +169,9 @@ func GetCygxBreakAppointmentCount(condition string, pars []interface{}) (count i
 	sqlCount := ` SELECT COUNT(1)  count FROM ( SELECT u.user_id 
 				FROM
 				cygx_activity_signup_break AS s
-				INNER JOIN wx_user AS u ON u.user_id = s.user_id
 				INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-				INNER JOIN company_product AS p ON p.company_id = u.company_id WHERE 1 = 1 ` + condition + ` GROUP BY u.user_id) AS c  `
-	o := orm.NewOrm()
+				 WHERE 1 = 1 ` + condition + ` GROUP BY s.user_id) AS c  `
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
@@ -207,37 +195,31 @@ type GetCygxBreakAppointmentListRep struct {
 }
 
 func GetCygxBreakAppointmentList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxBreakAppointmentList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			( SELECT COUNT( 1 ) FROM cygx_activity_restrict_signup AS sig WHERE sig.user_id = u.user_id AND sig.is_restrict = 1 ) AS is_restrict,
+			( SELECT COUNT( 1 ) FROM cygx_activity_restrict_signup AS sig WHERE sig.is_restrict = 1 ) AS is_restrict,
 			(
 			SELECT
 				COUNT( 1 ) count 
 			FROM
 				cygx_activity_signup_break AS s
-				INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id 
-			WHERE
-				1 = 1
-				AND s.user_id = u.user_id 
+				INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
 			) AS break_appointment_num,
-			u.real_name,
-			u.mobile,
-			u.user_id,
-			u.company_id,
-			c.company_name,
+			s.real_name,
+			s.mobile,
+			s.user_id,
+			s.company_id,
+			s.company_name,
 			s.activity_id
 		FROM
 			cygx_activity_signup_break AS s
-			INNER JOIN wx_user AS u ON u.user_id = s.user_id
 			INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			INNER JOIN company_product AS p ON p.company_id = u.company_id 
-			INNER JOIN company AS c ON c.company_id = u.company_id 
 		WHERE
 			1 = 1 `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY u.user_id ORDER BY break_appointment_num DESC,a.activity_time DESC LIMIT ?,?`
+	sql += ` GROUP BY s.user_id ORDER BY break_appointment_num DESC,a.activity_time DESC LIMIT ?,?`
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -246,15 +228,14 @@ func GetCygxBreakAppointmentList(condition string, pars []interface{}, startSize
 func GetCygxBreakAppointmentUserCount(uid int) (count int, err error) {
 	sqlCount := ` SELECT  COUNT(1) count
 				FROM
-				cygx_activity_signup AS s 
-                LEFT JOIN wx_user AS u ON u.user_id = s.user_id
+				cygx_activity_signup AS s
 				LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
 				WHERE
 				s.activity_id = a.activity_id 
 				AND s.is_meeting = 0 
 				AND a.is_submit_meeting = 1 
 				AND s.user_id = ? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
 }
@@ -302,7 +283,7 @@ type GetCygxActivityBreakAppointmentRep struct {
 }
 
 func GetCygxActivityBreakAppointmentList(mobile string) (items []*CygxActivityBreakAppointment, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT a.activity_name,a.activity_type_name,a.chart_permission_name,a.activity_time_text
    			FROM cygx_activity AS a
 			INNER JOIN cygx_activity_signup_break AS s ON s.activity_id = a.activity_id 
@@ -314,7 +295,7 @@ func GetCygxActivityBreakAppointmentList(mobile string) (items []*CygxActivityBr
 
 // 报名限制
 func AddSignUpRestrict(uid int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -333,24 +314,6 @@ func AddSignUpRestrict(uid int) (err error) {
 	if err != nil {
 		return
 	}
-	//if count == 0 {
-	//	sql = `DELETE  FROM cygx_my_schedule   WHERE user_id=?  AND activity_id=? `
-	//	_, err = to.Raw(sql, item.UserId, item.ActivityId).Exec()
-	//	if err != nil {
-	//		return
-	//	}
-	//}
-	//
-	//sql := `UPDATE cygx_activity_signup SET is_meeting = 0  WHERE activity_id =? `
-	//_, err = to.Raw(sql, uid).Exec()
-	//if err != nil {
-	//	return
-	//}
-	//sql = `UPDATE cygx_activity_signup SET is_meeting = 1  WHERE activity_id =? AND id IN `
-	//_, err = to.Raw(sql, uid).Exec()
-	//if err != nil {
-	//	return
-	//}
 	sql = `UPDATE cygx_activity SET is_submit_meeting = 1  WHERE activity_id = ? `
 	_, err = to.Raw(sql, uid).Exec()
 	return
@@ -371,13 +334,13 @@ func GetUserBreakAppointmentCount(uid int) (count int, err error) {
 				AND s.user_id = ? 
 				GROUP BY
 				s.user_id ) as cn `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
 }
 
 func GetCygxActivityRestrictSignupCount(uid int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_activity_restrict_signup WHERE user_id=? `
 	err = o.Raw(sql, uid).QueryRow(&count)
 	return
@@ -385,7 +348,7 @@ func GetCygxActivityRestrictSignupCount(uid int) (count int, err error) {
 
 // 获取限制报名详情
 func GetCygxActivityRestrictSignupInfo(uid int) (item *CygxActivityRestrictSignup, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_restrict_signup  WHERE user_id=?`
 	err = o.Raw(sql, uid).QueryRow(&item)
 	return
@@ -394,7 +357,7 @@ func GetCygxActivityRestrictSignupInfo(uid int) (item *CygxActivityRestrictSignu
 // 修改报名限制状态
 func UpdateCygxActivityRestrictSignup(newIsRestrict, uid int) (err error) {
 	sql := `UPDATE cygx_activity_restrict_signup SET  is_restrict=?  WHERE user_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, newIsRestrict, uid).Exec()
 	return
 }
@@ -413,173 +376,48 @@ type MeetingExportRep struct {
 	Permission          string `description:"开通权限"`
 }
 
-func GetMeetingExport(sqlStr string) (item []*MeetingExportRep, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT s.id, s.company_name,s.mobile,u.real_name,a.activity_name,a.chart_permission_name,a.activity_type_name,a.activity_time_text,p.status,p.seller_name,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name,
-			GROUP_CONCAT( DISTINCT c.chart_permission_name SEPARATOR '/' ) AS permission,
-			( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.company_id = u.company_id AND s.is_cancel = 0 AND s.fail_type = 0 ) AS company_num,
-			( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.user_id = u.user_id AND s.is_cancel = 0 AND s.fail_type = 0 ) AS user_num 
-			FROM
-			cygx_activity_signup AS s
-			INNER JOIN wx_user AS u ON u.user_id = s.user_id
-			INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = s.company_id
-			LEFT JOIN company_report_permission AS re ON re.company_id = s.company_id
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = re.chart_permission_id 
-			WHERE 1 = 1 
-			AND s.fail_type = 0 
-			AND s.is_cancel = 0 
-			AND p.status IN ( '正式', '试用' ) 
-			AND p.is_suspend = 0 
-			AND c.is_report = 1 ` + sqlStr + ` GROUP BY s.id ORDER BY company_num DESC,user_num DESC,a.activity_time DESC `
-	_, err = o.Raw(sql).QueryRows(&item)
-	return
-}
-
 // 获取报名了的用户IDs
 func GetSignupUserIds(activityId int, uIds string) (signupUids string, err error) {
 	sql := ` SELECT
 			GROUP_CONCAT( DISTINCT s.user_id SEPARATOR ',' ) AS signupUids 
 			FROM cygx_activity_signup AS s
             WHERE s.activity_id = ? AND s.do_fail_type = 0 AND s.user_id not IN (` + uIds + `)`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql, activityId).QueryRow(&signupUids)
 	return
 }
 
-// 获取报名了的用户IDs
-func GetSignupUserIdsFromOfflineMeeting(Ids string) (signupUids string, err error) {
-	sql := ` SELECT
-			GROUP_CONCAT( DISTINCT s.user_id SEPARATOR ',' ) AS signupUids 
-			FROM cygx_activity_offline_meeting_detail AS s WHERE s.id  IN (` + Ids + `)`
-	o := orm.NewOrm()
-	err = o.Raw(sql).QueryRow(&signupUids)
-	return
-}
-
-// 线下到会数据
-func GetMeetingExportOffline(condition string) (items []*MeetingExportRep, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			s.id,
-			s.company_name,
-			s.company_id,
-			s.mobile,
-			u.real_name,
-			a.activity_name,
-			a.chart_permission_name,
-			a.activity_type_name,
-			a.activity_time_text,
-			p.status,
-			p.seller_name,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name,
-			GROUP_CONCAT( DISTINCT c.chart_permission_name SEPARATOR '/' ) AS permission,
-			( SELECT COUNT( 1 ) FROM cygx_activity_offline_meeting_detail AS s WHERE s.company_id = u.company_id  AND s.is_meeting = 1 ) AS company_num,
-			( SELECT COUNT( 1 ) FROM cygx_activity_offline_meeting_detail AS s WHERE s.user_id = u.user_id    AND s.is_meeting = 1 ) AS user_num 
-		FROM
-			cygx_activity_offline_meeting_detail AS s
-			INNER JOIN wx_user AS u ON u.user_id = s.user_id
-			INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = s.company_id
-			LEFT JOIN company_report_permission AS re ON re.company_id = s.company_id
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = re.chart_permission_id 
-		WHERE
-			1 = 1 
-			AND p.status IN ( '正式', '试用' ) 
-			AND p.is_suspend = 0 
-			AND c.is_report = 1 
-			AND a.active_state = 3
-			AND s.is_meeting = 1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` GROUP BY s.id ORDER BY company_num DESC, user_num DESC, a.activity_time DESC, p.company_id DESC `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// 线上到会数据
-func GetMeetingExportOnline(condition string) (items []*MeetingExportRep, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			s.attendance_id,
-			s.company_name,
-			s.company_id,
-			s.mobile,
-			u.real_name,
-			a.activity_name,
-			a.chart_permission_name,
-			a.activity_type_name,
-			a.activity_time_text,
-			p.status,
-			p.seller_name,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name,
-			GROUP_CONCAT( DISTINCT c.chart_permission_name SEPARATOR '/' ) AS permission,
-			( SELECT COUNT( 1 ) FROM cygx_activity_attendance_detail AS s WHERE s.company_id = p.company_id ) AS company_num,
-			( SELECT COUNT( 1 ) FROM cygx_activity_attendance_detail AS s WHERE s.mobile = u.outbound_mobile ) AS user_num 
-		FROM
-			cygx_activity_attendance_detail AS s
-			INNER JOIN wx_user AS u ON u.outbound_mobile = s.mobile
-			INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id
-			LEFT JOIN company_report_permission AS re ON re.company_id = u.company_id
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = re.chart_permission_id 
-		WHERE
-			1 = 1 
-			AND p.status IN ( '正式', '试用' ) 
-			AND p.is_suspend = 0 
-			AND c.is_report = 1 
-			AND a.active_state = 3  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += `GROUP BY s.attendance_id ORDER BY company_num DESC, user_num DESC, a.activity_time DESC,p.company_id DESC  `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 // 到会数据
 func GetMeetingExportAll(condition string) (items []*MeetingExportRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			s.attendance_id,
 			s.company_name,
 			s.company_id,
 			s.mobile,
-			u.real_name,
+			s.real_name,
 			a.activity_name,
 			a.chart_permission_name,
 			a.activity_type_name,
 			a.activity_time_text,
-			p.status,
-			p.seller_name,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name,
-			GROUP_CONCAT( DISTINCT c.chart_permission_name SEPARATOR '/' ) AS permission
+			s.seller_name
 		FROM
 			cygx_activity_meet_detail_log AS s
-			INNER JOIN wx_user AS u ON u.outbound_mobile = s.mobile
 			INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			INNER JOIN company_product AS p ON p.company_id = u.company_id
-			INNER JOIN company_report_permission AS re ON re.company_id = u.company_id
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = re.chart_permission_id 
 		WHERE
-			1 = 1 
-			AND p.status IN ( '正式', '试用' ) 
-			AND p.is_suspend = 0 
-			AND c.is_report = 1 
+			1 = 1
 			AND s.company_name != ''
 			AND a.active_state = 3   `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY s.attendance_id ORDER BY s.company_meet_num DESC, s.user_meet_num DESC, a.activity_time DESC,p.company_id DESC   `
+	sql += ` GROUP BY s.attendance_id ORDER BY s.company_meet_num DESC, s.user_meet_num DESC, a.activity_time DESC   `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 func GetCompanyAciviytyGroupDate() (item []*CreateTimesResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT date_format(activity_time,'%Y-%m') as create_times FROM cygx_activity WHERE 1=1  AND  activity_time <= NOW()  GROUP BY create_times ORDER BY create_times DESC `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
@@ -594,7 +432,7 @@ type CygxYidongActivityMeetingApiLog struct {
 
 // 获取限制报名详情
 func GetCygxActivityYiDongUpdateTime(yidongActivityId string) (item *CygxYidongActivityMeetingApiLog, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_yidong_activity_meeting_api_log  WHERE yidong_activity_id = ? ORDER BY id DESC  LIMIT 1`
 	err = o.Raw(sql, yidongActivityId).QueryRow(&item)
 	return
@@ -618,7 +456,7 @@ func GetCygxActivityYiDongMeetNum(activityId []int) (items []*CygxAtivityIdMeetN
 			cygx_activity AS a 
 		WHERE
 			a.activity_id IN  (` + utils.GetOrmInReplace(lenactivityId) + `) `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }

models/cygx/activity_meet_detail_log.go

@@ -3,7 +3,6 @@ package cygx
 import (
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -20,7 +19,7 @@ type CygxActivityMeetDetailLog struct {
 }
 
 func GetOfflineMeetingDetailListCompanyName(companyName string) (item []*CygxActivityMeetDetailLog, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_meet_detail_log WHERE company_name IN (` + companyName + `)`
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
@@ -28,20 +27,20 @@ func GetOfflineMeetingDetailListCompanyName(companyName string) (item []*CygxAct
 
 // 添加
 func AddCygxActivityMeetDetailLog(item *CygxActivityMeetDetailLog) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	lastId, err = o.Insert(item)
 	return
 }
 
 func GetActivityMeetDetailLog(mobileStr string) (item []*CygxActivityMeetDetailLog, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM  cygx_activity_meet_detail_log WHERE mobile IN (` + mobileStr + `)`
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
 }
 
 func GetActivityMeetDetailLogByMobile() (item []*CygxActivityMeetDetailLog, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM  cygx_activity_meet_detail_log WHERE mobile !='' GROUP BY mobile `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
@@ -49,7 +48,7 @@ func GetActivityMeetDetailLogByMobile() (item []*CygxActivityMeetDetailLog, err
 
 // 获取数量
 func GetActivityMeetDetailLogCount(condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_activity_meet_detail_log WHERE 1=1 `
 	if condition != "" {
 		sqlCount += condition
@@ -61,7 +60,7 @@ func GetActivityMeetDetailLogCount(condition string) (count int, err error) {
 // 修改公司参会数量
 func UpdateActivityMeetDetailLog(companyName string, num int) (err error) {
 	sql := ` UPDATE cygx_activity_meet_detail_log SET  company_meet_num= ?  WHERE company_name = ?`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, num, companyName).Exec()
 	return
 }
@@ -69,7 +68,7 @@ func UpdateActivityMeetDetailLog(companyName string, num int) (err error) {
 // 修改个人参会数量
 func UpdateActivityMeetDetailLogByUser(mobile string, num int) (err error) {
 	sql := ` UPDATE cygx_activity_meet_detail_log SET  user_meet_num= ?  WHERE mobile = ?`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, num, mobile).Exec()
 	return
 }
@@ -85,7 +84,7 @@ func GetMeetDetailLogGroupCount(condition string, pars []interface{}) (items []*
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count,company_id,mobile FROM cygx_activity_meet_detail_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -94,109 +93,9 @@ func GetMeetDetailLogGroupCount(condition string, pars []interface{}) (items []*
 	return
 }
 
-// 添加线下到会记录
-func AddCygxActivityMeetDetailLogOffline(meetingUids string, activityId int) (err error) {
-
-	o := orm.NewOrm()
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-	var CompanyIdStr string
-	var companyIdArr []int
-	var MobileStr string
-	var mobileArr []string
-	var items []*CygxActivityMeetDetailLog
-	list, err := GetOfflineMeetingListByUser(meetingUids, activityId)
-	if err != nil {
-		return
-	}
-	//删除原有数据
-	sql := ` DELETE FROM cygx_activity_meet_detail_log WHERE activity_id = ?`
-	_, err = to.Raw(sql, activityId).Exec()
-	if err != nil {
-		return
-	}
-	//插入新的数据
-	for _, v := range list {
-		item := new(CygxActivityMeetDetailLog)
-		item.ActivityId = v.ActivityId
-		item.Mobile = v.Mobile
-		item.CompanyName = v.CompanyName
-		item.CompanyId = v.CompanyId
-		item.CreateTime = v.CreateTime
-		CompanyIdStr += strconv.Itoa(v.CompanyId) + ","
-		if v.Mobile != "" {
-			MobileStr += v.Mobile + ","
-			mobileArr = append(mobileArr, v.Mobile)
-		}
-		companyIdArr = append(companyIdArr, v.CompanyId)
-		items = append(items, item)
-	}
-	CompanyIdStr = strings.TrimRight(CompanyIdStr, ",")
-	MobileStr = strings.TrimRight(MobileStr, ",")
-	if len(items) > 0 {
-		//批量添加记录
-		_, err = to.InsertMulti(len(items), items)
-		if err != nil {
-			return
-		}
-	}
-	listCompanyId, err := GetOfflineMeetingDetailListCompanyIdStr(CompanyIdStr)
-	if err != nil {
-		return
-	}
-	//修改公司对应的数量
-	var condition string
-	var companyNameArr []string
-	for _, v := range listCompanyId {
-		var total int
-		companyNameArr = append(companyNameArr, v.CompanyName)
-		condition = ` AND company_name = '` + v.CompanyName + `' `
-		total, err = GetActivityMeetDetailLogCount(condition)
-		if err != nil {
-			return
-		}
-		sql := ` UPDATE cygx_activity_meet_detail_log SET  company_meet_num= ?  WHERE company_name = ?`
-		_, err = to.Raw(sql, total, v.CompanyName).Exec()
-		if err != nil {
-			return
-		}
-	}
-
-	listMobile, err := GetActivityMeetDetailLog(MobileStr)
-	if err != nil {
-		return
-	}
-	//修改个人对应的数量
-	for _, v := range listMobile {
-		var total int
-		condition = ` AND mobile = '` + v.Mobile + `' `
-		total, err = GetActivityMeetDetailLogCount(condition)
-		if err != nil {
-			return
-		}
-		sql := ` UPDATE cygx_activity_meet_detail_log SET  user_meet_num= ?  WHERE mobile = ?`
-		_, err = to.Raw(sql, total, v.Mobile).Exec()
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
 // 添加线下到会记录
 func UpdatecygxActivityMeetDetailLogOffline(items []*CygxActivityMeetDetailLog, itemsUpdateCompany []*MeetDetailLoggGroupCount, itemsUpdateMobile []*MeetDetailLoggGroupCount, activityId int) (err error) {
-
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -224,50 +123,12 @@ func UpdatecygxActivityMeetDetailLogOffline(items []*CygxActivityMeetDetailLog,
 			return
 		}
 	}
-
-	//修改公司对应的数量
-	//if len(itemsUpdateCompany) > 0 {
-	//	p, err := to.Raw(` UPDATE cygx_activity_meet_detail_log SET company_meet_num = ? WHERE company_id = ? `).Prepare()
-	//	if err != nil {
-	//		return
-	//	}
-	//	defer func() {
-	//		_ = p.Close() // 别忘记关闭 statement
-	//	}()
-	//	for _, v := range itemsUpdateCompany {
-	//		_, err = p.Exec(
-	//			v.Count,
-	//			v.CompanyId)
-	//		if err != nil {
-	//			return
-	//		}
-	//	}
-	//}
-	//
-	////修改用户对应的数量
-	//if len(itemsUpdateMobile) > 0 {
-	//	p, err := to.Raw(` UPDATE cygx_activity_meet_detail_log SET user_meet_num= ?  WHERE mobile = ? `).Prepare()
-	//	if err != nil {
-	//		return
-	//	}
-	//	defer func() {
-	//		_ = p.Close() // 别忘记关闭 statement
-	//	}()
-	//	for _, v := range itemsUpdateCompany {
-	//		_, err = p.Exec(
-	//			v.Count,
-	//			v.Mobile)
-	//		if err != nil {
-	//			return
-	//		}
-	//	}
-	//}
 	return
 }
 
 // 添加线上到会记录
 func AddCygxActivityMeetDetailLogOnline(list []*CygxActivityAttendanceDetail, activityId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return

models/cygx/activity_meeting_history.go

@@ -33,32 +33,32 @@ type CygxActivityMeetingHistoryListResp struct {
 	List []*CygxActivityMeetingHistoryResp
 }
 
-//新增
+// 新增
 func AddCygxActivityMeetingHistory(item *CygxActivityMeetingHistory) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }
 
-//获取列表
+// 获取列表
 func GetCygxActivityMeetingHistoryLlist(activityId int) (items []*CygxActivityMeetingHistoryResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_activity_meeting_history WHERE  activity_id=  ? AND  role_type_code IN ('rai_seller','rai_group')   ORDER BY id DESC   `
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }
 
-//获取最新详情
+// 获取最新详情
 func GetCygxActivityMeetingHistoryNew(activityId, adminId int) (item *CygxActivityMeetingHistory, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_meeting_history  WHERE activity_id=? AND admin_id = ? ORDER BY id DESC LIMIT 1 `
 	err = o.Raw(sql, activityId, adminId).QueryRow(&item)
 	return
 }
 
-//更新阅读时间
+// 更新阅读时间
 func UpdateActivityMeetingHistoryTime(stipTime, id int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` UPDATE cygx_activity_meeting_history SET  stop_time=?   WHERE id=?`
 	_, err = o.Raw(sql, stipTime, id).Exec()
 	return

models/cygx/activity_meeting_reminder.go

@@ -42,17 +42,9 @@ type AddUserList struct {
 	SignupType    int `description:"报名方式，1预约外呼，2自主拨入，3我要报名"`
 }
 
-// 获取用户报名数量
-func GetActivityMeetingReminderCount(uid, activityId int) (count int, err error) {
-	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_meeting_reminder WHERE is_cancel=0 AND user_id=? AND activity_id=? `
-	o := orm.NewOrm()
-	err = o.Raw(sqlCount, uid, activityId).QueryRow(&count)
-	return
-}
-
 // 取消会议提醒
 func CancelActivityMeetingReminder(item *CygxActivityMeetingReminder) (lastId int64, err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("hz_cygx").Begin()
 	if err != nil {
 		return
 	}
@@ -90,16 +82,11 @@ func CancelActivityMeetingReminder(item *CygxActivityMeetingReminder) (lastId in
 
 // 会议提醒的人数列表
 func GetCygxActivityMeetingReminderList(activityId int, sqlStr string) (item []*CygxAppointmentList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT s.id,s.activity_id,s.user_id,s.create_time,s.mobile,s.company_id ,u.real_name,c.company_name,a.activity_time,
-			(SELECT p.seller_name from company_product as p WHERE p.company_id = u.company_id  AND  p.product_id = 2 )  AS seller_name,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT s.*,a.activity_time
 			FROM
 			cygx_activity_meeting_reminder AS s
-			INNER JOIN wx_user AS u ON  u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
-			LEFT JOIN company AS c ON c.company_id = u.company_id 
 			WHERE a.activity_id = ?  ` + sqlStr + `  GROUP BY s.user_id   ORDER BY s.create_time DESC `
 	_, err = o.Raw(sql, activityId).QueryRows(&item)
 	return
@@ -107,12 +94,10 @@ func GetCygxActivityMeetingReminderList(activityId int, sqlStr string) (item []*
 
 // 会议提醒的人数数量
 func GetCygxActivityMeetingReminderCount(activityId int, sqlStr string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(*) FROM
 			cygx_activity_meeting_reminder AS s
-			INNER  JOIN wx_user AS u ON  u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
 			WHERE
 			s.activity_id = ? ` + sqlStr + `
             GROUP BY s.user_id)`
@@ -123,7 +108,7 @@ func GetCygxActivityMeetingReminderCount(activityId int, sqlStr string) (count i
 
 // 通过ID获取会议提醒详情
 func GetCygxActivityMeetingReminderInfoById(id int) (item *CygxActivityMeetingReminder, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_meeting_reminder  WHERE id=?`
 	err = o.Raw(sql, id).QueryRow(&item)
 	return
@@ -131,7 +116,7 @@ func GetCygxActivityMeetingReminderInfoById(id int) (item *CygxActivityMeetingRe
 
 // 添加会议提醒
 func AddActivityMeetingReminderUser(items []*CygxActivityAppointment, itemsReminder []*CygxActivityMeetingReminder) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return

models/cygx/activity_offline_meeting_detail.go

@@ -22,18 +22,18 @@ type CygxActivityOfflineMeetingDetail struct {
 
 // 预约外呼列表
 func GetOfflineMeetingList(condition string) (items []*CygxActivitySignupList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT s.* , u.real_name,
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT s.* ,
 			( SELECT COUNT( 1 ) FROM cygx_activity_signup AS a WHERE a.activity_id = s.activity_id AND a.user_id = s.user_id AND a.do_fail_type = 0 ) AS channel
 			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).QueryRows(&items)
 	return
 }
 
 // 预约外呼列表
 func GetOfflineMeetingListByUser(meetingUids string, activityId int) (items []*CygxActivityOfflineMeetingDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT s.* FROM cygx_activity_offline_meeting_detail  as s  WHERE activity_id = ? AND user_id IN  (` + meetingUids + `)`
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
@@ -41,14 +41,14 @@ func GetOfflineMeetingListByUser(meetingUids string, activityId int) (items []*C
 
 // 预约外呼列表
 func GetOfflineMeetingListByYidong(condition string) (items []*CygxActivitySignupList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_activity_signup as s  WHERE  1= 1 AND s.yidong_examine_status != 2 ` + condition
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 func GetOfflineMeetingDetailListCompanyIdStr(companyIdStr string) (item []*CygxActivityMeetDetailLog, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_offline_meeting_detail WHERE company_id IN (` + companyIdStr + `)`
 	_, err = o.Raw(sql).QueryRows(&item)
 	return

models/cygx/activity_points_bill.go

@@ -44,7 +44,7 @@ type CygxActivityPointsBillResp struct {
 
 // CygxActivityPointsBillByCompanyId 根据公司名称获取机构流水表
 func CygxActivityPointsBillByCompanyId(companyId int) (items []*CygxActivityPointsBillResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT  * FROM cygx_activity_points_bill WHERE company_id =?  ORDER BY id DESC  `
 	_, err = o.Raw(sql, companyId).QueryRows(&items)
 	return
@@ -55,7 +55,7 @@ func GetCygxActivityPointsBillDetailByCondition(condition string, pars []interfa
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_points_bill  WHERE 1 = 1  ` + condition
 	err = o.Raw(sql, pars).QueryRow(&item)
 	return
@@ -63,7 +63,7 @@ func GetCygxActivityPointsBillDetailByCondition(condition string, pars []interfa
 
 // AddCygxActivityPointsBillMulti 批量添加
 func AddCygxActivityPointsBillMulti(items []*CygxActivityPointsBill, itemsUpdate []*CygxActivityPointsCompany) (err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("hz_cygx").Begin()
 	if err != nil {
 		return
 	}
@@ -97,7 +97,7 @@ func AddCygxActivityPointsBillMulti(items []*CygxActivityPointsBill, itemsUpdate
 
 // AddCygxActivityPointsBillAndCompanyMulti 批量添加
 func AddCygxActivityPointsBillAndCompanyMulti(items []*CygxActivityPointsBill, itemsCompany []*CygxActivityPointsCompany) (err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("hz_cygx").Begin()
 	if err != nil {
 		return
 	}
@@ -121,7 +121,7 @@ func AddCygxActivityPointsBillAndCompanyMulti(items []*CygxActivityPointsBill, i
 
 // UpdateCygxActivityPointsBillMulti 批量修改
 func UpdateCygxActivityPointsBillMulti(items []*CygxActivityPointsBill, itemsUpdate []*CygxActivityPointsCompany) (err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("hz_cygx").Begin()
 	if err != nil {
 		return
 	}

models/cygx/activity_points_company.go

@@ -16,7 +16,7 @@ type CygxActivityPointsCompany struct {
 
 // 通过公司ID获取详情
 func GetCygxActivityPointsCompanyByCompanyId(companyId int) (item *CygxActivityPointsCompany, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_points_company  WHERE company_id=? `
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	return
@@ -24,7 +24,7 @@ func GetCygxActivityPointsCompanyByCompanyId(companyId int) (item *CygxActivityP
 
 // 获取公司剩余点数
 func GetCompanyPoints(companyId int) (comapnyPointsNum float64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT points FROM cygx_activity_points_company  WHERE company_id=? `
 	err = o.Raw(sql, companyId).QueryRow(&comapnyPointsNum)
 	return

models/cygx/activity_points_set.go

@@ -52,7 +52,7 @@ type CygxActivityPointsSetConfigResp struct {
 
 // 通过活动ID获取详情
 func GetCygxActivityPointsSetDetail(activityId int) (item *CygxActivityPointsSetRsq, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_points_set  WHERE activity_id=? `
 	err = o.Raw(sql, activityId).QueryRow(&item)
 	return
@@ -60,7 +60,7 @@ func GetCygxActivityPointsSetDetail(activityId int) (item *CygxActivityPointsSet
 
 // 通过活动ID获取详情
 func GetCygxActivityPointsSetUserNum(activityId int) (userPointsNum float64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT user_points_num FROM cygx_activity_points_set  WHERE activity_id=? `
 	err = o.Raw(sql, activityId).QueryRow(&userPointsNum)
 	return
@@ -69,7 +69,7 @@ func GetCygxActivityPointsSetUserNum(activityId int) (userPointsNum float64, err
 // 通过互动ID获取数量
 func GetCygxActivityPointsSetCountByActivityId(ActivityId int) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_activity_points_set  WHERE activity_id=?   `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, ActivityId).QueryRow(&count)
 	return
 }

models/cygx/activity_poster.go

@@ -16,7 +16,7 @@ type CygxActivityPoster struct {
 
 // 添加
 func AddCygxActivityPoster(item *CygxActivityPoster) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }

models/cygx/activity_restrict_signup.go

@@ -19,7 +19,7 @@ type CygxActivityRestrictSignup struct {
 
 // 添加
 func AddCygxActivityRestrictSignup(item *CygxActivityRestrictSignup) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }
@@ -30,14 +30,14 @@ func AddCygxActivityRestrictSignupList(items []*CygxActivityRestrictSignup) (las
 	if lenitems == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 // 删除
 func DeleteCygxActivityRestrictSignup(uid int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_activity_restrict_signup  WHERE user_id=?`
 	_, err = o.Raw(sql, uid).Exec()
 	return
@@ -48,7 +48,7 @@ func DeleteCygxActivityRestrictSignupByUserIds(userIdDelArr []int) (err error) {
 	if len(userIdDelArr) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_activity_restrict_signup  WHERE  1= 1  AND user_id IN (` + utils.GetOrmInReplace(len(userIdDelArr)) + `)`
 	_, err = o.Raw(sql, userIdDelArr).Exec()
 	return
@@ -57,7 +57,7 @@ func DeleteCygxActivityRestrictSignupByUserIds(userIdDelArr []int) (err error) {
 // 获取某一用户是否被限制报名
 func GetUserRestrictCount(mobile string) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_restrict_signup WHERE is_restrict=1  AND mobile=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, mobile).QueryRow(&count)
 	return
 }
@@ -65,14 +65,14 @@ func GetUserRestrictCount(mobile string) (count int, err error) {
 // 获取用户是否被限制报名
 func GetRestrictSignupCountByUid(uid int) (count int, err error) {
 	sqlCount := `SELECT COUNT( 1 ) count FROM cygx_activity_restrict_signup  WHERE user_id = ?`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxActivityRestrictSignupList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityRestrictSignup, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_restrict_signup as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

models/cygx/activity_signin.go

@@ -41,14 +41,14 @@ func GetCygxActivitySigninCount(condition string, pars []interface{}) (count int
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxActivitySigninList(condition string, pars []interface{}) (items []*CygxActivitySignin, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_activity_signin as s  WHERE  1= 1  ` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return

models/cygx/activity_signup.go

@@ -52,20 +52,20 @@ func GetCygxSignupCount(condition string, pars []interface{}) (count int, err er
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxSignupListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxSignupList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT 
-		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s INNER JOIN wx_user as u ON u.user_id = s.user_id WHERE s.activity_id = art.activity_id  AND s.is_cancel = 0 AND  s.do_fail_type = 0 AND  s.company_id != 16 ) AS signup_people_num,
-		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s INNER JOIN wx_user as u ON u.user_id = s.user_id WHERE s.activity_id = art.activity_id  AND s.is_cancel = 0 AND  s.fail_type >= 1) AS signup_fail_people_num, 
-		( SELECT COUNT( 1 ) FROM cygx_activity_help_ask AS k INNER JOIN wx_user as u ON u.user_id = k.user_id WHERE k.activity_id = art.activity_id ) AS ask_num, 
-		( SELECT COUNT( 1 ) FROM cygx_activity_appointment AS ap INNER JOIN wx_user as u ON u.user_id = ap.user_id WHERE ap.activity_id = art.activity_id ) AS appointment_people_num,
-		( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS ap   INNER JOIN wx_user as u ON u.user_id = ap.user_id WHERE ap.activity_id = art.activity_id ) AS reminder_people_num,
+		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id  AND s.is_cancel = 0 AND  s.do_fail_type = 0 AND  s.company_id != 16 ) AS signup_people_num,
+		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s  WHERE s.activity_id = art.activity_id  AND s.is_cancel = 0 AND  s.fail_type >= 1) AS signup_fail_people_num, 
+		( SELECT COUNT( 1 ) FROM cygx_activity_help_ask AS k  WHERE k.activity_id = art.activity_id ) AS ask_num, 
+		( SELECT COUNT( 1 ) FROM cygx_activity_appointment AS ap  WHERE ap.activity_id = art.activity_id ) AS appointment_people_num,
+		( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS ap    WHERE ap.activity_id = art.activity_id ) AS reminder_people_num,
 		art.* FROM cygx_activity as art
 		WHERE 1= 1 `
 	if condition != "" {
@@ -109,23 +109,18 @@ type CygxSignupId struct {
 
 // 预约外呼列表
 func GetCygxAppointmentLisssst(activityId int) (items []*CygxAppointmentList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_signup  WHERE activity_id= ? `
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }
 
 func GetCygxAppointmentList(article_id int, sqlStr string) (item []*CygxAppointmentList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT s.id,s.activity_id,s.user_id,s.create_time,s.mobile,s.outbound_mobile,s.company_id,s.fail_type ,s.fail_type,s.signup_type,a.is_limit_people,u.real_name,c.company_name,a.activity_time,s.country_code,s.yidong_examine_status,s.email,
-			(SELECT p.seller_name from company_product as p WHERE p.company_id = u.company_id  AND  p.product_id = 2 )  AS seller_name,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT s.*
 			FROM
 			cygx_activity_signup AS s
-			INNER JOIN wx_user AS u ON  u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
-			LEFT JOIN company AS c ON c.company_id = u.company_id 
 			WHERE a.activity_id = ?  AND s.do_fail_type = 0 ` + sqlStr + `  GROUP BY s.user_id   ORDER BY s.create_time DESC `
 	_, err = o.Raw(sql, article_id).QueryRows(&item)
 	return
@@ -145,12 +140,10 @@ type GetAppointmentListRep struct {
 }
 
 func GetCygxAppointmentCount(articleId int, sqlStr string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(*) FROM
 			cygx_activity_signup AS s
-			INNER  JOIN wx_user AS u ON  u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
 			WHERE
 			s.activity_id = ? ` + sqlStr + `
             GROUP BY s.user_id)`
@@ -259,7 +252,7 @@ func GetUserAndCompanyNameListByUids(uids string) (items []*UserAndCompanyName,
 
 // 新增预约人数
 func AddCygxActivitySignup(items []*CygxActivitySignup, itemsAppointment []*CygxActivityAppointment, mapYidongActivity map[int]int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -326,58 +319,10 @@ func AddCygxActivitySignup(items []*CygxActivitySignup, itemsAppointment []*Cygx
 	return
 }
 
-func AddCygxActivitySignup2(item *CygxActivitySignup) (err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-	var count int
-	sql := `SELECT COUNT(1) AS count FROM cygx_my_schedule WHERE user_id=? AND activity_id=? `
-	err = to.Raw(sql, item.UserId, item.ActivityId).QueryRow(&count)
-	if err != nil {
-		return
-	}
-	if count == 0 {
-		itemMy := new(CygxMySchedule)
-		itemMy.UserId = item.UserId
-		itemMy.ActivityId = item.ActivityId
-		itemMy.CreateTime = time.Now()
-		itemMy.Mobile = item.Mobile
-		itemMy.Email = item.Email
-		itemMy.CompanyId = item.CompanyId
-		itemMy.CompanyName = item.CompanyName
-		_, err = to.Insert(itemMy)
-		if err != nil {
-			return
-		}
-	}
-	sql = `SELECT COUNT(1) AS count FROM cygx_activity_signup WHERE user_id=? AND activity_id=? `
-	err = to.Raw(sql, item.UserId, item.ActivityId).QueryRow(&count)
-	if err != nil {
-		return
-	}
-	if count == 0 {
-		_, err = to.Insert(item)
-	} else {
-		sql := `UPDATE cygx_activity_signup SET  is_cancel=0, do_fail_type = 0 ,create_time = NOW() WHERE user_id=? AND activity_id=? `
-		_, err = to.Raw(sql, item.UserId, item.ActivityId).Exec()
-	}
-	return
-}
-
 // 获取用户报名数量
 func GetActivitySignupCount(uid, activityId int) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_signup WHERE is_cancel=0  AND do_fail_type = 0  AND user_id=? AND activity_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, uid, activityId).QueryRow(&count)
 	return
 }
@@ -387,19 +332,18 @@ func GetActivitySignupCountByActivityId(activityId int) (count int, err error) {
 					COUNT( 1 ) AS count 
 				FROM
 					cygx_activity_signup AS s
-					INNER JOIN wx_user AS u ON u.user_id = s.user_id 
 				WHERE
 					s.do_fail_type = 0 
 					AND s.company_id != 16 
 					AND s.activity_id = ? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, activityId).QueryRow(&count)
 	return
 }
 
 func GetActivitySignupCountByThisUser(activityId int, uids string) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_signup WHERE do_fail_type = 0 AND activity_id=? AND user_id IN (` + uids + `) `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, activityId).QueryRow(&count)
 	return
 }
@@ -444,9 +388,7 @@ func GetFailSignupList(activity_id int, sqlStr string) (item []*FailSignupListRe
 	sql := `SELECT s.* ,a.is_limit_people
 			FROM
 			cygx_activity_signup AS s
-			INNER JOIN wx_user AS u ON u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
 			WHERE a.activity_id = ?` + sqlStr + ` GROUP BY s.id  ORDER BY s.create_time DESC `
 	_, err = o.Raw(sql, activity_id).QueryRows(&item)
 	return
@@ -466,19 +408,19 @@ type SignupIdCall struct {
 // 获取失败数量
 func GetCygxSignupCountFile(id int) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_activity_signup  WHERE id= ?`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, id).QueryRow(&count)
 	return
 }
 func GetCygxSignupDetailById(id int) (item *FailSignupListRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_signup  WHERE id=?`
 	err = o.Raw(sql, id).QueryRow(&item)
 	return
 }
 
 func GetCygxSignupDetailByUid(id int) (item *FailSignupListRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_signup  WHERE user_id=? LIMIT 1`
 	err = o.Raw(sql, id).QueryRow(&item)
 	return
@@ -486,7 +428,7 @@ func GetCygxSignupDetailByUid(id int) (item *FailSignupListRep, err error) {
 
 // 加入报名限制报名
 func SalonSignupEdit(newIsAdminAddSignup, doFailType, id int, item *CygxActivitySignup) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -536,7 +478,7 @@ func SalonSignupEdit(newIsAdminAddSignup, doFailType, id int, item *CygxActivity
 }
 
 func CallSignupEditByStatus3(doFailType, id int, item *CygxMySchedule) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -563,7 +505,7 @@ func CallSignupEditByStatus3(doFailType, id int, item *CygxMySchedule) (err erro
 }
 
 func CallSignupEditByStatus1_2(operationStatus, id int, item *CygxMySchedule) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -606,20 +548,6 @@ type SignupExportRep struct {
 	OutboundMobile string `description:"外呼手机号"`
 }
 
-func GetSignupExport(activity_id int, sqlStr string) (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
-			FROM
-			cygx_activity_signup AS s
-			INNER JOIN wx_user AS u ON u.user_id = s.user_id
-			INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-			INNER JOIN company_product AS p ON p.company_id = u.company_id 
-			WHERE a.activity_id = ?` + sqlStr
-	_, err = o.Raw(sql, activity_id).QueryRows(&item)
-	return
-}
-
 type CygxActivitySignupList struct {
 	Id          int    `orm:"column(id);pk"`
 	UserId      int    `description:"用户id"`
@@ -645,15 +573,16 @@ type CygxActivitySignupListRep struct {
 
 // 预约外呼列表
 func GetCygxActivitySignup(condition string) (items []*CygxActivitySignupList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT s.* , u.real_name FROM cygx_activity_signup  as s 
-	INNER JOIN wx_user as u ON u.user_id = s.user_id  WHERE 1 =1 ` + condition
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT s.*  FROM cygx_activity_signup  as s 
+	  WHERE 1 =1 ` + condition
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 // 获取用户报名数量
 func GetActivitySignupNomeetingCount(activityId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `SELECT
 	COUNT( 1 ) count 
 FROM
@@ -665,14 +594,13 @@ WHERE
 	AND s.is_meeting = 0 
 	AND a.is_submit_meeting = 1
 	AND a.activity_id = ?`
-	o := orm.NewOrm()
 	err = o.Raw(sqlCount, activityId).QueryRow(&count)
 	return
 }
 
 // 获取用户报名列表
 func GetActivitySignupNomeetingCountList(activityId int) (items []*CygxActivitySignupList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 	s.*
 FROM
@@ -689,6 +617,7 @@ WHERE
 
 // 获取用户爽约次数
 func GetActivitySignupNomeetingCountByUid(uid int) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `SELECT
 	COUNT( 1 ) count 
 FROM
@@ -701,13 +630,12 @@ WHERE
 	AND a.is_submit_meeting = 1
 	AND s.do_fail_type = 0
 	AND s.user_id = ?`
-	o := orm.NewOrm()
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
 }
 
 func GetUserMeetingMobile(activityId int) (items []*CygxActivitySignup, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *
 FROM
 	cygx_activity_signup AS s 
@@ -726,7 +654,7 @@ type OutboundMobileEditResp struct {
 }
 
 func OutboundMobileEdit(id int, outboundMobile, countryCode string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_activity_signup SET outbound_mobile = ?,country_code=?  WHERE id=? `
 	_, err = o.Raw(sql, outboundMobile, countryCode, id).Exec()
 	return
@@ -735,7 +663,7 @@ func OutboundMobileEdit(id int, outboundMobile, countryCode string) (err error)
 //end
 
 func AddCygxActivitySignupUser(items []*CygxActivitySignup) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -786,7 +714,7 @@ func AddCygxActivitySignupUser(items []*CygxActivitySignup) (err error) {
 
 // 通过ID获取报名详情
 func GetActivitySignupInfoById(id int) (item *CygxActivitySignup, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_signup  WHERE id=?`
 	err = o.Raw(sql, id).QueryRow(&item)
 	return
@@ -804,7 +732,7 @@ type RequestCommonPolicyConfig struct {
 
 // 取消报名
 func CancelActivitySignup(item *CygxActivitySignup) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -1031,12 +959,12 @@ type YidongActivitySignup struct {
 
 // GetCompanyByUserSignUp 获取客户ID列表
 func GetCompanyByUserSignUp(condition string, pars []interface{}) (items []*company.CompanyNameAndId, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 	s.company_id
 FROM
 	cygx_activity_signup AS s
 	INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-	INNER JOIN wx_user AS u ON u.mobile = s.mobile 
 	INNER JOIN cygx_activity_type AS t ON t.activity_type_id = a.activity_type_id 
 WHERE
 	1 = 1 
@@ -1046,7 +974,7 @@ WHERE
 		sql += condition
 	}
 	sql += ` GROUP BY s.company_id `
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&items)
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
@@ -1065,14 +993,14 @@ type UserSignUpLossListResp struct {
 
 // GetUserSignUpList 获取用户报名列表
 func GetUserSignUpList(condition string, pars []interface{}) (items []*UserSignUpLossResp, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 	s.real_name,
 	s.mobile 
 FROM
 	cygx_activity_signup_detail AS s
 	INNER JOIN cygx_activity AS a ON a.activity_id = s.activity_id
-	INNER JOIN cygx_activity_type AS t ON t.activity_type_id = a.activity_type_id 
-	INNER JOIN wx_user AS u ON u.mobile = s.mobile
+	INNER JOIN cygx_activity_type AS t ON t.activity_type_id = a.activity_type_id
 WHERE
 	1 = 1 
 	AND s.is_meeting = 1 
@@ -1080,7 +1008,7 @@ WHERE
 	if condition != `` {
 		sql += condition
 	}
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&items)
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
@@ -1131,8 +1059,8 @@ func GetCompanyPermissionByUsersZhengShi(companyIds string) (items []*Permission
 
 // 获取某一活动某个机构已经报名的数量
 func GetActivitySignupCompanyCount(activityId, companyId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_signup WHERE is_cancel=0 AND do_fail_type = 0 AND activity_id=? AND company_id=? `
-	o := orm.NewOrm()
 	err = o.Raw(sqlCount, activityId, companyId).QueryRow(&count)
 	return
 }
@@ -1160,19 +1088,20 @@ func GetCompanyPermissionByUserTrip(companyId int) (permission string, err error
 
 // GetCygxCygxActivitySignupList 获取报名列表信息
 func GetActivitySignupList(condition string, pars []interface{}) (items []*CygxActivitySignup, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			*
 		FROM
 			cygx_activity_signup AS v
 		WHERE
 			1 = 1 	` + condition
-	o := orm.NewOrm()
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
 // GetCygxCygxActivitySignupList 获取报名列表信息
 func GetActivitySignupInnerActivityList(condition string, pars []interface{}) (items []*CygxActivitySignup, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			*
 		FROM
@@ -1180,7 +1109,6 @@ func GetActivitySignupInnerActivityList(condition string, pars []interface{}) (i
 			INNER JOIN cygx_activity as a ON v.activity_id = a.activity_id
 		WHERE
 			1 = 1 	` + condition
-	o := orm.NewOrm()
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/cygx/activity_signup_break.go

@@ -20,7 +20,7 @@ type CygxActivitySignupBreak struct {
 
 // 添加爽约记录
 func AddCygxActivitySignupBreak(item *CygxActivitySignupBreak) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	lastId, err = o.Insert(item)
 	return
 }
@@ -31,14 +31,14 @@ func AddCygxActivitySignupBreakList(items []*CygxActivitySignupBreak) (lastId in
 	if lenitems == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 // 删除
 func DeleteCygxActivitySignupBreakById(activityId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_activity_signup_break  WHERE  activity_id =? `
 	_, err = o.Raw(sql, activityId).Exec()
 	return

models/cygx/activity_signup_detail.go

@@ -36,27 +36,29 @@ type CygxActivitySignupDetail struct {
 
 // 获取今天报名的用户信息，存入到参会记录表中
 func GetSignupDetailBySignup(condition string, pars []interface{}) (list []*CygxActivitySignupDetail, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_signup  WHERE  1= 1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&list)
+	_, err = o.Raw(sql, pars).QueryRows(&list)
 	return
 }
 
 // 获取参会记录表列表
 func GetSignupDetailList(condition string, pars []interface{}) (list []*CygxActivitySignupDetail, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_signup_detail  WHERE  1= 1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&list)
+	_, err = o.Raw(sql, pars).QueryRows(&list)
 	return
 }
 
 // 添加
 func AddCygxActivitySignupDetail(items []*CygxActivitySignupDetail) (err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("hz_cygx").Begin()
 	if err != nil {
 		return
 	}
@@ -79,7 +81,7 @@ func AddCygxActivitySignupDetail(items []*CygxActivitySignupDetail) (err error)
 
 // UpdateActivitySignupDetailMulti 批量修改用户报名信息且报名的人
 func UpdateActivitySignupDetailMulti(items []*CygxActivitySignupDetail) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	p, err := o.Raw(` UPDATE cygx_activity_signup_detail SET 
 							first_meeting_time = ?,
 							last_meeting_time = ?,

models/cygx/activity_special.go

@@ -140,7 +140,7 @@ type CygxActivitySpecial struct {
 
 // 添加活动
 func AddActivitySpecial(item *CygxActivitySpecial, industrialActivityItems []*CygxIndustrialActivityGroupManagement, subjectActivityItems []*CygxIndustrialActivityGroupSubject) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -182,7 +182,7 @@ func AddActivitySpecial(item *CygxActivitySpecial, industrialActivityItems []*Cy
 
 // 通过纪要ID获取活动详情
 func GetAddActivityInfoSpecialById(ActivityId int) (item *ActivitySpecialDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_special  WHERE activity_id=?`
 	err = o.Raw(sql, ActivityId).QueryRow(&item)
 	return
@@ -190,7 +190,7 @@ func GetAddActivityInfoSpecialById(ActivityId int) (item *ActivitySpecialDetail,
 
 // 通过纪要ID获取活动详情
 func GetCustomerName(ids string) (name string, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT GROUP_CONCAT( DISTINCT c.customer_name SEPARATOR '、' ) AS name 
 			FROM cygx_customer_type AS c WHERE c.customer_type_id IN (` + ids + `)`
 	err = o.Raw(sql).QueryRow(&name)
@@ -199,7 +199,7 @@ func GetCustomerName(ids string) (name string, err error) {
 
 // 修改
 func EditActivitySpecial(updateParams map[string]interface{}, item *CygxActivitySpecial, industrialActivityItems []*CygxIndustrialActivityGroupManagement, subjectActivityItems []*CygxIndustrialActivityGroupSubject) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -258,7 +258,7 @@ func EditActivitySpecial(updateParams map[string]interface{}, item *CygxActivity
 
 // 修改
 func EditActivitySpecialStatus(item *CygxActivitySpecial) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_activity_special SET publish_status=?, last_updated_time=NOW()  WHERE activity_id=?`
 	_, err = o.Raw(sql, item.PublishStatus, item.ActivityId).Exec()
 	return
@@ -266,7 +266,7 @@ func EditActivitySpecialStatus(item *CygxActivitySpecial) (err error) {
 
 // 修改
 func UpdateActivitySpecial(updateParams map[string]interface{}, item *CygxActivitySpecial) (err error) {
-	to := orm.NewOrm()
+	to := orm.NewOrmUsingDB("hz_cygx")
 	//修改活动信息
 	ptrStructOrTableName := "cygx_activity_special"
 	whereParam := map[string]interface{}{"activity_id": item.ActivityId}
@@ -280,7 +280,7 @@ func UpdateActivitySpecial(updateParams map[string]interface{}, item *CygxActivi
 
 // 修改是否下线
 func EditActivitySpecialIsOffline(item *CygxActivitySpecial) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_activity_special SET is_offline=?,publish_status=?, last_updated_time=NOW()   WHERE activity_id=?`
 	_, err = o.Raw(sql, item.IsOffline, item.PublishStatus, item.ActivityId).Exec()
 	return
@@ -318,9 +318,9 @@ type GetCygxActivityListSpecialRep struct {
 
 // 列表
 func GetActivityListSpecialAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivitySpecialList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT  (SELECT COUNT(1) FROM cygx_activity_special_signup AS h  INNER JOIN wx_user AS u ON u.user_id = h.user_id    WHERE h.activity_id=art.activity_id) AS interested_num ,
- (SELECT COUNT(1) FROM cygx_activity_special_trip AS h  INNER JOIN wx_user AS u ON u.user_id = h.user_id    WHERE h.activity_id=art.activity_id AND h.is_cancel =0 ) AS signup_people_num ,
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT  (SELECT COUNT(1) FROM cygx_activity_special_signup AS h     WHERE h.activity_id=art.activity_id) AS interested_num ,
+ (SELECT COUNT(1) FROM cygx_activity_special_trip AS h      WHERE h.activity_id=art.activity_id AND h.is_cancel =0 ) AS signup_people_num ,
 			art.*  FROM cygx_activity_special as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -336,14 +336,14 @@ func GetActivitySpecialCount(condition string, pars []interface{}) (count int, e
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 删除数据
 func DeleteActivitySpecial(activityId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_activity_special WHERE activity_id = ?`
 	_, err = o.Raw(sql, activityId).Exec()
 	return
@@ -367,23 +367,12 @@ type CygxActivitySpecialSignupListResp struct {
 
 // 感兴趣列表
 func GetCygxActivitySpecialSignupList(activityId int) (items []*CygxActivitySpecialSignup, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			s.id,
-			s.activity_id,
-			s.user_id,
-			s.mobile,
-			s.create_time,
-			u.real_name,
-			c.company_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,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name 
+			s.*
 		FROM
 			cygx_activity_special_signup AS s
-			INNER JOIN wx_user AS u ON u.user_id = s.user_id
 			LEFT JOIN cygx_activity_special AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id
-			LEFT JOIN company AS c ON c.company_id = u.company_id 
 		WHERE
 			a.activity_id = ?  
 		GROUP BY
@@ -397,11 +386,11 @@ func GetCygxActivitySpecialSignupList(activityId int) (items []*CygxActivitySpec
 // 获取数量
 func GetCygxActivitySpecialSignupCount(condition string, pars []interface{}) (count int, err error) {
 	sqlCount := ` 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  WHERE 1= 1  `
+			 WHERE 1= 1  `
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
@@ -429,28 +418,16 @@ type CygxActivitySpecialSignupRespList struct {
 
 // 列表
 func GetCygxActivitySpecialSignupListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivitySpecialSignupResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			s.id,
-			s.activity_id,
-			s.user_id,
-			s.create_time,
-			s.user_num,
-			u.real_name,
-			c.company_name,
-			c.company_id,
+			s.*,
 			a.research_theme,
 			a.label,
 			a.chart_permission_name,
-			a.create_time AS publish_date,
-			( SELECT p.seller_name FROM company_product AS p WHERE p.company_id = u.company_id AND p.product_id = 2 ) AS seller_name,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name 
+			a.create_time AS publish_date
 		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
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id
-			LEFT JOIN company AS c ON c.company_id = u.company_id 
 		WHERE
 			1 = 1 `
 	if condition != "" {
@@ -470,80 +447,54 @@ type AdminOpenIdList struct {
 }
 
 // GetAdminOpendidByCompany 通过用户公司ID获取对应销售的openid
-func GetAdminOpendidByCompany(condition string, pars []interface{}) (list []*AdminOpenIdList, err error) {
+func GetAdminMobileByCompany(condition string, pars []interface{}) (list []*AdminOpenIdList, err error) {
 	sql := `SELECT
-			cr.open_id,a.mobile,p.company_id,cr.union_id
+		a.mobile,p.company_id
 		FROM
 			company_product AS p
-			INNER JOIN admin AS a ON a.admin_id = p.seller_id 
-			INNER JOIN user_record  as c ON c.bind_account = a.mobile
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = c.union_id
+			INNER JOIN admin AS a ON a.admin_id = p.seller_id
 		WHERE
 			1 = 1 
-			AND p.product_id = 2
-			AND create_platform = 4 ` + condition
+			AND p.product_id = 2 ` + condition
 	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&list)
 	return
 }
 
 // 获取预约活动的用户的openID
 func GetActivitySpecialOpenIdList() (items []*AdminOpenIdList, err error) {
-	sql := `SELECT DISTINCT cr.open_id,u.user_id,m.company_id
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT DISTINCT u.open_id,u.cygx_user_id as  user_id ,m.company_id
 			FROM
 			cygx_user_follow_special AS m
-			INNER JOIN user_record AS u ON u.bind_account = m.mobile 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE  u.create_platform = 4 `
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
+			INNER JOIN cygx_user_record AS u ON u.cygx_bind_account = m.mobile  `
+	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
-func GetActivitySpecialByIndustryIds(condition string, pars []interface{}) (list []*CygxActivitySpecialSignup, err error) {
-	sql := `SELECT
-			m.activity_id
-		FROM
-			cygx_industrial_activity_group_management AS m
-			INNER JOIN cygx_activity_special AS a ON a.activity_id = m.activity_id
-		WHERE
- 			1= 1
-			AND m.source = 2
-			AND a.publish_status = 1 AND a.is_offline = 0 AND a.days >0  ` + condition
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&list)
-	return
-}
-
-func GetWxOpenIdByMobileList(condition string, pars []interface{}) (items []*OpenIdList, err error) {
-	sql := `SELECT cr.*,user_id FROM user_record  as c
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = c.union_id
-			WHERE  1= 1 AND create_platform = 4 ` + condition
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&items)
-	return
-}
-
-func GetWxOpenIdBList(condition string, pars []interface{}) (items []*OpenIdList, err error) {
-	sql := `SELECT
-	cr.*,
-	u.user_id 
-FROM
-	cygx_user_record AS cr
-	INNER JOIN user_record AS c ON c.union_id = cr.union_id
-	INNER JOIN wx_user AS u ON u.user_id = c.user_id 
-WHERE
-	1 = 1 
-	AND c.create_platform = 4 ` + condition + ` GROUP BY	cr.open_id `
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&items)
-	return
-}
+//func GetWxOpenIdBList(condition string, pars []interface{}) (items []*OpenIdList, err error) {
+//	sql := `SELECT
+//	cr.*,
+//	u.user_id
+//FROM
+//	cygx_user_record AS cr
+//	INNER JOIN user_record AS c ON c.union_id = cr.union_id
+//	INNER JOIN wx_user AS u ON u.user_id = c.user_id
+//WHERE
+//	1 = 1
+//	AND c.create_platform = 4 ` + condition + ` GROUP BY	cr.open_id `
+//	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&items)
+//	return
+//}
 
 // 通过产业名称获取关联的ID
 func GetactivitySpecilIdsByLabel(name string) (activityIds string, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 				GROUP_CONCAT( DISTINCT s.activity_id SEPARATOR ',' ) AS activityIds 
 			FROM
 				cygx_activity_special AS s 
 			WHERE
 				label LIKE  '%` + name + `%' `
-	o := orm.NewOrm()
 	err = o.Raw(sql).QueryRow(&activityIds)
 	return
 }

models/cygx/activity_special_day.go

@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-//活动详情
+// 活动详情
 type CygxActivitySpecialDay struct {
 	Id         int       `orm:"column(id);pk";description:"Id"`
 	ActivityId int       `description:"活动ID"`
@@ -14,7 +14,7 @@ type CygxActivitySpecialDay struct {
 	DayTime    string    `description:"活动行程时间"`
 }
 
-//活动详情
+// 活动详情
 type CygxActivitySpecialDayResp struct {
 	Id         int       `orm:"column(id);pk";description:"Id"`
 	ActivityId int       `description:"活动ID"`
@@ -22,9 +22,9 @@ type CygxActivitySpecialDayResp struct {
 	DayTime    time.Time `description:"活动行程时间"`
 }
 
-//添加活动
+// 添加活动
 func AddCygxActivitySpecialDay(items []*CygxActivitySpecialDay, activityId int) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -53,9 +53,9 @@ func AddCygxActivitySpecialDay(items []*CygxActivitySpecialDay, activityId int)
 	return
 }
 
-//列表
+// 列表
 func GetCygxActivitySpecialDayByActivityId(activityId int) (items []*CygxActivitySpecialDayResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT  *  FROM cygx_activity_special_day as art WHERE activity_id= ? `
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return

models/cygx/activity_special_meeting_detail.go

@@ -45,17 +45,17 @@ type MeetingSpeciaDoRep struct {
 
 // 列表
 func GetCygxActivitySpecialMeetingDetailListByActivity(activityId int) (items []*CygxActivitySpecialMeetingDetailResp, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT s.* , u.real_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT s.*
 			FROM cygx_activity_special_meeting_detail  as s 
-			INNER JOIN wx_user as u ON u.user_id = s.user_id  WHERE 1 =1  AND s.activity_id =? `
+			WHERE 1 =1  AND s.activity_id =? `
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }
 
 // 到会操作
 func MeetingDopecialMeet(meetingUids, noMeetingUids string, ActivityId int, items []*CygxActivitySpecialMeetingDetail, itemsBill []*CygxActivitySpecialTripBill) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -125,7 +125,7 @@ func MeetingDopecialMeet(meetingUids, noMeetingUids string, ActivityId int, item
 
 // 列表
 func GetCygxActivitySpecialMeetingDetailList(condition string, pars []interface{}) (items []*CygxActivitySpecialMeetingDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT s.* 
 			FROM cygx_activity_special_meeting_detail  as s  WHERE 1 =1   ` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&items)
@@ -133,7 +133,7 @@ func GetCygxActivitySpecialMeetingDetailList(condition string, pars []interface{
 }
 
 func GetCygxActivitySpecialMeetingDetailListByActivityId(activityId int) (item []*CygxActivitySpecialMeetingDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *
 			FROM
 			cygx_activity_special_trip  
@@ -144,7 +144,7 @@ func GetCygxActivitySpecialMeetingDetailListByActivityId(activityId int) (item [
 
 // 列表
 func UpdateCygxActivitySpecialMeetingDetailRealName(realName, mobile string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	//添加记录表的到会信息
 	sql := `UPDATE cygx_activity_special_meeting_detail SET real_name = ?  WHERE mobile = ? `
 	_, err = o.Raw(sql, realName, mobile).Exec()
@@ -153,7 +153,7 @@ func UpdateCygxActivitySpecialMeetingDetailRealName(realName, mobile string) (er
 
 // 添加
 func AddCygxActivitySpecialMeetingDetail(item *CygxActivitySpecialMeetingDetail) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }

models/cygx/activity_special_trip.go

@@ -54,18 +54,17 @@ func GetActivitySpecialTripCountByActivityId(activityId int) (count int, err err
 					COUNT( 1 ) AS count 
 				FROM
 					cygx_activity_special_trip AS s
-					INNER JOIN wx_user AS u ON u.user_id = s.user_id 
 				WHERE
 					s.is_cancel = 0 
 					AND s.activity_id = ? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, activityId).QueryRow(&count)
 	return
 }
 
 func GetActivitySpecialTripCountByThisUser(activityId int, uids string) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip WHERE is_cancel = 0 AND activity_id=? AND user_id IN (` + uids + `) `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, activityId).QueryRow(&count)
 	return
 }
@@ -73,14 +72,14 @@ func GetActivitySpecialTripCountByThisUser(activityId int, uids string) (count i
 // 获取用户报名数量
 func GetActivitySpecialTripCount(uid, activityId int) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip WHERE is_cancel=0   AND user_id=? AND activity_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, uid, activityId).QueryRow(&count)
 	return
 }
 
 // 新增预约人数
 func AddCygxActivitySpecialTrip(items []*CygxActivitySpecialTrip, itemsBill []*CygxActivitySpecialTripBill, itemsMeet []*CygxActivitySpecialMeetingDetail) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -143,28 +142,23 @@ type GetAppointmentSpecialListRsep struct {
 }
 
 func GetCygxActivitySpecialTripList(activityId int, condition string) (item []*CygxActivitySpecialTripResp, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT s.id,s.activity_id,s.user_id,s.create_time,s.mobile,s.company_id,u.real_name,c.company_name,a.activity_time,s.outbound_mobile,s.country_code,a.special_type,
-			(SELECT p.seller_name from company_product as p WHERE p.company_id = u.company_id  AND  p.product_id = 2 )  AS seller_name,
-			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS pseller_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT s.*
+					a.activity_time,
+					a.special_type
 			FROM
 			cygx_activity_special_trip AS s
-			INNER JOIN wx_user AS u ON  u.user_id = s.user_id
 			INNER JOIN cygx_activity_special AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
-			LEFT JOIN company AS c ON c.company_id = u.company_id 
 			WHERE a.activity_id = ?  ` + condition + `  GROUP BY s.user_id   ORDER BY s.create_time DESC `
 	_, err = o.Raw(sql, activityId).QueryRows(&item)
 	return
 }
 
 func GetActivitySpecialTripTotal(activityId int, sqlStr string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(*) FROM
 			cygx_activity_special_trip AS s
-			INNER  JOIN wx_user AS u ON  u.user_id = s.user_id
 			LEFT JOIN cygx_activity_special AS a ON a.activity_id = s.activity_id
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
 			WHERE
 			s.activity_id = ? ` + sqlStr + `
             GROUP BY s.user_id)`
@@ -176,7 +170,7 @@ func GetActivitySpecialTripTotal(activityId int, sqlStr string) (count int, err
 
 // ActivitySpecialTripCancel 取消报名
 func ActivitySpecialTripCancel(isValid, activityId, uid int) (err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("hz_cygx").Begin()
 	if err != nil {
 		return
 	}
@@ -204,21 +198,21 @@ func GetSpecialTripUserIds(activityId int, uIds string) (signupUids string, err
 			GROUP_CONCAT( DISTINCT s.user_id SEPARATOR ',' ) AS signupUids 
 			FROM cygx_activity_special_trip AS s
             WHERE s.activity_id = ? AND s.is_cancel = 0 AND s.user_id not IN (` + uIds + `)`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql, activityId).QueryRow(&signupUids)
 	return
 }
 
 // 修改外呼手机号
 func SpecialTripOutboundMobileEdit(id int, outboundMobile, countryCode string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_activity_special_trip SET outbound_mobile = ?,country_code=?  WHERE id=? `
 	_, err = o.Raw(sql, outboundMobile, countryCode, id).Exec()
 	return
 }
 
 func GetCygxActivitySpecialTripListByActivityId(activityId int) (item []*CygxActivitySpecialTripResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *
 			FROM
 			cygx_activity_special_trip  
@@ -229,7 +223,7 @@ func GetCygxActivitySpecialTripListByActivityId(activityId int) (item []*CygxAct
 
 // 获取公司报名的记录
 func GetCygxActivitySpecialTripListByComapnyId(companyId int) (item []*CygxActivitySpecial, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			t.*,
 			a.chart_permission_id,
@@ -245,7 +239,7 @@ func GetCygxActivitySpecialTripListByComapnyId(companyId int) (item []*CygxActiv
 
 // 获取空降的公司报名的记录
 func GetCygxActivitySpecialTripAirborneListByComapnyId(companyId int) (item []*CygxActivitySpecial, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			t.*,
 			a.chart_permission_id,
@@ -268,7 +262,7 @@ type ActivitySpecialSignupTempMsgReq struct {
 
 // 列表
 func GetCygxActivitySpecialTripListCondition(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivitySpecialTrip, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_special_trip as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -282,18 +276,17 @@ func GetCygxActivitySpecialTripListCondition(condition string, pars []interface{
 	return
 }
 
-//获取某一用户的报名的数量
+// 获取某一用户的报名的数量
 func GetUserActivitySpecialTripCount(uid, activityId int) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip  WHERE  user_id=?  AND   activity_id =? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, uid, activityId).QueryRow(&count)
 	return
 }
 
-
 func UpdateSpecialTrip(isValid, isCancel, userId, activityId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_activity_special_trip SET is_valid = ?,create_time=NOW(),is_cancel=?  WHERE user_id=? AND activity_id=? `
 	_, err = o.Raw(sql, isValid, isCancel, userId, activityId).Exec()
 	return
-}
+}

models/cygx/activity_special_trip_bill.go

@@ -49,7 +49,7 @@ type CygxActivitySpecialTripBillList struct {
 
 // 添加
 func AddCygxActivitySpecialTripBill(item *CygxActivitySpecialTripBill) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	if err != nil {
 		return
@@ -58,7 +58,7 @@ func AddCygxActivitySpecialTripBill(item *CygxActivitySpecialTripBill) (err erro
 }
 
 func GetCygxActivitySpecialTripBill(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBill, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *
 			FROM
 			cygx_activity_special_trip_bill  
@@ -68,13 +68,11 @@ func GetCygxActivitySpecialTripBill(condition string, pars []interface{}) (item
 }
 
 func GetCygxActivitySpecialTripBillList(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBillList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			b.*,
-			c.chart_permission_name 
+			b.*
 		FROM
 			cygx_activity_special_trip_bill AS b
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id 
 		WHERE
 			1 = 1` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&item)
@@ -94,7 +92,7 @@ func GetActivitySpecialTripAirborneListByActivitySpecial(condition string, pars
 			INNER JOIN cygx_activity_special AS a ON a.activity_id = t.activity_id 
 		WHERE
 			 1= 1  	AND YEAR ( t.create_time )= YEAR (NOW()) ` + condition + `GROUP BY chart_permission_id`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sqlCount, pars).QueryRows(&items)
 	return
 }
@@ -107,7 +105,7 @@ func GetActivitySpecialTripAirborneCountByActivitySpecial(condition string, pars
 			INNER JOIN cygx_activity_special AS a ON a.activity_id = t.activity_id 
 		WHERE
 			 1= 1  	AND YEAR ( t.create_time )= YEAR (NOW()) ` + condition
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
@@ -135,21 +133,21 @@ type CygxActivitySpecialTripBillDetailList struct {
 	Total               string    `description:"总和"`
 }
 
-func GetCygxActivitySpecialTripBillDetailList(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBillDetailList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			b.*,
-			a.research_theme,
-			c.chart_permission_name 
-		FROM
-			cygx_activity_special_trip_bill AS b
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id 
-			INNER JOIN cygx_activity_special AS a ON a.activity_id = b.activity_id
-		WHERE
-			1 = 1` + condition
-	_, err = o.Raw(sql, pars).QueryRows(&item)
-	return
-}
+//func GetCygxActivitySpecialTripBillDetailList(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBillDetailList, err error) {
+//	o := orm.NewOrm()
+//	sql := `SELECT
+//			b.*,
+//			a.research_theme,
+//			c.chart_permission_name
+//		FROM
+//			cygx_activity_special_trip_bill AS b
+//			INNER JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id
+//			INNER JOIN cygx_activity_special AS a ON a.activity_id = b.activity_id
+//		WHERE
+//			1 = 1` + condition
+//	_, err = o.Raw(sql, pars).QueryRows(&item)
+//	return
+//}
 
 type CygxActivitySpecialPointsBillRespItem struct {
 	Id                  int    `gorm:"column:id;primary_key;AUTO_INCREMENT"`
@@ -170,14 +168,12 @@ type CygxActivitySpecialPointsBillResp struct {
 }
 
 func GetCygxActivitySpecialTripBillDetailListAll(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBillDetailList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			b.*,
-			a.research_theme,
-			c.chart_permission_name 
+			a.research_theme
 		FROM
 			cygx_activity_special_trip_bill AS b
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id 
 			LEFT JOIN cygx_activity_special AS a ON a.activity_id = b.activity_id
 		WHERE
 			1 = 1` + condition
@@ -188,7 +184,7 @@ func GetCygxActivitySpecialTripBillDetailListAll(condition string, pars []interf
 }
 
 func GetCygxActivitySpecialTripBillByCompanyId(companyId int) (item *CygxActivitySpecialTripBill, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			*
 		FROM
@@ -196,4 +192,4 @@ func GetCygxActivitySpecialTripBillByCompanyId(companyId int) (item *CygxActivit
 		`
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	return
-}
+}

models/cygx/activity_type.go

@@ -21,14 +21,14 @@ type ActivityTypeListResp struct {
 
 // 列表
 func GetActivityTypeList() (items []*ActivityType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_type ORDER BY sort DESC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 func GetActivityTypeDetailById(activityTypeId int) (item *ActivityType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_type WHERE activity_type_id = ? `
 	err = o.Raw(sql, activityTypeId).QueryRow(&item)
 	return
@@ -36,7 +36,7 @@ func GetActivityTypeDetailById(activityTypeId int) (item *ActivityType, err erro
 
 // 列表
 func GetActivityTypeSearchList(condition string) (items []*ActivityType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_type WHERE 1= 1  ` + condition + `  ORDER BY sort DESC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return

models/cygx/activity_user_remarks.go

@@ -37,14 +37,14 @@ type CygxActivityUserRemarksListResp struct {
 
 // 新增
 func AddCygxActivityUserRemarks(item *CygxActivityUserRemarks) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }
 
 // 获取备注列表
 func GetCygxActivityUserRemarksLlist(mobile string) (items []*CygxActivityUserRemarksResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_activity_user_remarks WHERE  mobile IN (` + mobile + `)  ORDER BY id DESC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -52,7 +52,7 @@ func GetCygxActivityUserRemarksLlist(mobile string) (items []*CygxActivityUserRe
 
 // 获取备注列表
 func GetCygxActivityUserRemarksLlistByActivityId(mobile string, activityId int) (items []*CygxActivityUserRemarksResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_activity_user_remarks WHERE  mobile IN (` + mobile + `) AND activity_id = ?  ORDER BY id DESC`
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return

models/cygx/activity_video.go

@@ -53,14 +53,14 @@ type CygxActivityVideoListRep struct {
 
 // 添加
 func AddCygxActivityVideo(item *CygxActivityVideo) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newId, err = o.Insert(item)
 	return
 }
 
 // 修改
 func UpdateCygxActivityVideo(item *CygxActivityVideo) (err error) {
-	to := orm.NewOrm()
+	to := orm.NewOrmUsingDB("hz_cygx")
 	updateParams := make(map[string]interface{})
 	updateParams["VideoName"] = item.VideoName
 	updateParams["VideoDuration"] = item.VideoDuration
@@ -90,14 +90,14 @@ func GetActivityVideoCount(condition string, pars []interface{}) (count int, err
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetActivityVideoListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT art.*,v.video_id,v.video_name,v.video_counts,video_duration,
 (SELECT COUNT(1) FROM cygx_article_comment AS h    WHERE h.activity_id=art.activity_id AND  h.industry_id = 0 AND  h.activity_voice_id = 0) AS comment_num
 			FROM cygx_activity as art  INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id   WHERE 1= 1  `
@@ -111,7 +111,7 @@ func GetActivityVideoListAll(condition string, pars []interface{}, startSize, pa
 
 // 历史记录
 func GetActivityVideoHistoryById(condition string, pars []interface{}) (item []*CygxMicroRoadshowVoiceHistory, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			h.* 
 		FROM
@@ -130,7 +130,7 @@ func GetActivityVideoHistoryById(condition string, pars []interface{}) (item []*
 
 // 详情
 func GetCygxActivityVideoReqDetail(activityId int) (item *CygxActivityVideo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_activity_video  WHERE activity_id= ? `
 	err = o.Raw(sql, activityId).QueryRow(&item)
 	return
@@ -138,7 +138,7 @@ func GetCygxActivityVideoReqDetail(activityId int) (item *CygxActivityVideo, err
 
 // 列表
 func GetCygxActivityVideoReqDetailByVideoId(videoId int) (item *CygxActivityVideo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_activity_video  WHERE video_id= ? `
 	err = o.Raw(sql, videoId).QueryRow(&item)
 	return
@@ -146,7 +146,7 @@ func GetCygxActivityVideoReqDetailByVideoId(videoId int) (item *CygxActivityVide
 
 // 列表
 func GetActivityVideoList(condition string, pars []interface{}) (items []*CygxActivityVideoListResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT  * FROM  cygx_activity_video  WHERE  1=1  `
 	if condition != "" {
 		sql += condition
@@ -191,7 +191,7 @@ type ActivityVideoDefaultImgResp struct {
 
 // 删除数据
 func DeleteCygxActivityVideo(activityId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_activity_video WHERE  activity_id= ? `
 	_, err = o.Raw(sql, activityId).Exec()
 	return

models/cygx/activity_voice.go

@@ -29,14 +29,14 @@ type CygxActivityVoiceReq struct {
 
 // 添加
 func AddCygxActivityVoice(item *CygxActivityVoice) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newId, err = o.Insert(item)
 	return
 }
 
 // 修改
 func UpdateCygxActivityVoice(item *CygxActivityVoice) (err error) {
-	to := orm.NewOrm()
+	to := orm.NewOrmUsingDB("hz_cygx")
 	updateParams := make(map[string]interface{})
 	updateParams["VoiceName"] = item.VoiceName
 	updateParams["VoicePlaySeconds"] = item.VoicePlaySeconds
@@ -59,14 +59,14 @@ func GetCygxActivityVoiceCount(condition string, pars []interface{}) (count int,
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxActivityVoiceReqList(activityId int) (items []*CygxActivityVoiceReq, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT 
 			background_img,
 			share_img,
@@ -80,7 +80,7 @@ func GetCygxActivityVoiceReqList(activityId int) (items []*CygxActivityVoiceReq,
 
 // 列表
 func GetActivityVoiceList(condition string, pars []interface{}) (items []*CygxActivityVoice, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT  * FROM  cygx_activity_voice  WHERE  1=1  `
 	if condition != "" {
 		sql += condition
@@ -90,7 +90,7 @@ func GetActivityVoiceList(condition string, pars []interface{}) (items []*CygxAc
 }
 
 func GetCygxActivityVoiceReqDetail(activityId int) (item *CygxActivityVoice, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_activity_voice  WHERE activity_id= ? `
 	err = o.Raw(sql, activityId).QueryRow(&item)
 	return
@@ -98,7 +98,7 @@ func GetCygxActivityVoiceReqDetail(activityId int) (item *CygxActivityVoice, err
 
 // 删除数据
 func DeleteCygxActivityVoice(activityId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_activity_voice WHERE  activity_id= ? `
 	_, err = o.Raw(sql, activityId).Exec()
 	return

models/cygx/advice.go

@@ -25,10 +25,8 @@ type AdviceListResp struct {
 }
 
 func GetAdviceListCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT COUNT(1) AS count FROM cygx_advice AS a
-			LEFT JOIN wx_user AS b ON a.user_id=b.user_id
-			LEFT JOIN company AS c ON a.company_id=c.company_id`
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT COUNT(1) AS count FROM cygx_advice AS a `
 	if condition != "" {
 		sql += condition
 	}
@@ -37,11 +35,8 @@ func GetAdviceListCount(condition string, pars []interface{}) (count int, err er
 }
 
 func GetAdviceList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxAdvice, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.real_name AS user_real_name,c.company_name,b.mobile,b.email FROM cygx_advice AS a
-			LEFT JOIN wx_user AS b ON a.user_id=b.user_id
-			LEFT JOIN company AS c ON a.company_id=c.company_id
-			 `
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` SELECT a.*  FROM cygx_advice AS a `
 	if condition != "" {
 		sql += condition
 	}

models/cygx/apply_record.go

@@ -67,13 +67,9 @@ type CygxApplyRecordResp struct {
 }
 
 func GetCygxApplyRecord(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxApplyRecordResp, err error) {
-	o := orm.NewOrm()
-
-	sql := ` SELECT DISTINCT a.*,i.invitee_mobile,i.invitee_company,i.invitee_email,invitee_company_id, GROUP_CONCAT(b.seller_name ORDER BY b.product_id ASC SEPARATOR '/') AS seller_name,c.email,(SELECT COUNT(1) FROM company WHERE company_id =invitee_company_id ) as invitee_company_num
-        FROM cygx_apply_record AS a
-		LEFT JOIN company_product AS b ON a.company_id_pay=b.company_id
-		LEFT JOIN wx_user AS c ON a.user_id=c.user_id 
-		LEFT JOIN user_invitee AS i ON a.user_id = i.inviteed_user_id WHERE 1=1 `
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` SELECT DISTINCT a.*
+        FROM cygx_apply_record AS a `
 	if condition != "" {
 		sql += condition
 	}
@@ -83,7 +79,7 @@ func GetCygxApplyRecord(condition string, pars []interface{}, startSize, pageSiz
 }
 
 func GetCygxApplyRecordCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	//sql := `SELECT COUNT(1) AS count FROM cygx_apply_record AS a
 	//	LEFT JOIN company_product AS b ON a.company_id_pay=b.company_id
 	//	LEFT JOIN wx_user AS c ON a.user_id=c.user_id WHERE 1=1 `
@@ -91,11 +87,8 @@ func GetCygxApplyRecordCount(condition string, pars []interface{}) (count int, e
 	//if condition != "" {
 	//	sql += condition
 	//}
-	sql := `SELECT COUNT(1) AS count FROM ( SELECT DISTINCT a.*,
-GROUP_CONCAT(b.seller_name ORDER BY b.product_id ASC SEPARATOR '/') AS seller_name,c.email 
-        FROM cygx_apply_record AS a
-		LEFT JOIN company_product AS b ON a.company_id_pay=b.company_id
-		LEFT JOIN wx_user AS c ON a.user_id=c.user_id WHERE 1=1 `
+	sql := `SELECT COUNT(1) AS count FROM ( SELECT DISTINCT a.*
+        FROM cygx_apply_record AS a `
 	if condition != "" {
 		sql += condition
 	}
@@ -115,7 +108,7 @@ type CygxDealReq struct {
 
 func DealCygxApplyRecord(applyRecordId, sysUserId int) (err error) {
 	sql := `UPDATE cygx_apply_record SET status=1,deal_time=NOW(),sys_user_id=? WHERE apply_record_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, sysUserId, applyRecordId).Exec()
 	return
 }

models/cygx/article_ask.go

@@ -19,12 +19,11 @@ type ArticleAskListResp struct {
 	List []*ArticleAsk
 }
 
-//列表
+// 列表
 func GetArticleAskList(articleId int) (items []*ArticleAsk, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT k.*,u.real_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT k.*
 			FROM cygx_article_ask  as k
-			LEFT JOIN wx_user as u ON u.mobile = k.mobile
 			WHERE article_id = ? ORDER BY create_time DESC`
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return

models/cygx/article_comment.go

@@ -19,45 +19,21 @@ type ArticleCommentListResp struct {
 	List []*ArticleComment
 }
 
-//列表
+// 列表
 func GetArticleCommentList(articleId int) (items []*ArticleComment, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT k.*,u.real_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT k.*
 			FROM cygx_article_comment  as k
-			LEFT JOIN wx_user as u ON u.mobile = k.mobile
 			WHERE article_id = ? ORDER BY create_time DESC`
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return
 }
 
-//列表
-func GetArticleCommentListByVideoId(videoId int) (items []*ArticleComment, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT k.*,u.real_name
-			FROM cygx_article_comment  as k
-			LEFT JOIN wx_user as u ON u.mobile = k.mobile
-			WHERE video_id = ? ORDER BY create_time DESC`
-	_, err = o.Raw(sql, videoId).QueryRows(&items)
-	return
-}
-
-//列表
-func GetArticleCommentListByActivityVideoId(videoId int) (items []*ArticleComment, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT k.*,u.real_name
-			FROM cygx_article_comment  as k
-			LEFT JOIN wx_user as u ON u.mobile = k.mobile
-			WHERE video_id = ? ORDER BY create_time DESC`
-	_, err = o.Raw(sql, videoId).QueryRows(&items)
-	return
-}
-
-//留言列表
+// 留言列表
 func GetArticleCommentListSearch(condition string, pars []interface{}) (items []*ArticleComment, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT k.*,u.real_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` SELECT k.*
 			FROM cygx_article_comment  as k
-			LEFT JOIN wx_user as u ON u.mobile = k.mobile
 			WHERE  1= 1  ` + condition + ` ORDER BY create_time DESC `
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return

models/cygx/article_department.go

@@ -29,48 +29,48 @@ type CygxArticleDepartmentList struct {
 	List []*CygxArticleDepartmentRep
 }
 
-//新增
+// 新增
 func AddCygxArticleDepartment(item *CygxArticleDepartment) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newId, err = o.Insert(item)
 	return
 }
 
-//详情
+// 详情
 func GetArticleDepartmentDateil(nickName, remarks string) (item *CygxArticleDepartmentRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article_department WHERE nick_name = ? AND  remarks = ? LIMIT 1 `
 	err = o.Raw(sql, nickName, remarks).QueryRow(&item)
 	return
 }
 
-//详情
+// 详情
 func GetArticleDepartmentDateilById(departmentId int) (item *CygxArticleDepartmentRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article_department WHERE department_id = ? `
 	err = o.Raw(sql, departmentId).QueryRow(&item)
 	return
 }
 
-//数量
+// 数量
 func GetArticleDepartmentCount(nickName, remarks string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1)  FROM cygx_article_department WHERE nick_name = ? AND  remarks = ? `
 	err = o.Raw(sql, nickName, remarks).QueryRow(&count)
 	return
 }
 
-//数量
+// 数量
 func GetArticleDepartmentCountAll() (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1)  FROM cygx_article_department`
 	err = o.Raw(sql).QueryRow(&count)
 	return
 }
 
-//列表
+// 列表
 func GetCygxArticleDepartmentList(condition string) (items []*CygxArticleDepartmentRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article_department `
 	if condition != "" {
 		sql += condition
@@ -92,27 +92,23 @@ type CygxDepartmentFllowRep struct {
 	List     []*CygxDepartmentFllowList
 }
 
-//列表
+// 列表
 func GetCygxDepartmentFllowList(departmentId int) (items []*CygxDepartmentFllowList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			u.real_name,c.company_name,b.real_name as seller_name ,f.create_time
+			f.*
 		FROM
 			cygx_article_department_follow AS f
-			INNER  JOIN wx_user AS u ON u.user_id = f.user_id
-			INNER JOIN company_product AS c ON c.company_id = u.company_id
-			INNER JOIN admin AS b ON b.admin_id = c.seller_id 
 		WHERE
 			f.department_id = ?
-			AND f.type = 1
-			AND c.product_id = 2 `
+			AND f.type = 1 `
 	_, err = o.Raw(sql, departmentId).QueryRows(&items)
 	return
 }
 
-//详情
+// 详情
 func GetArticleDepartmentDateilByDepartmentId(departmentId int) (item *CygxArticleDepartment, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article_department WHERE department_id = ? `
 	err = o.Raw(sql, departmentId).QueryRow(&item)
 	return

models/cygx/article_type.go

@@ -28,32 +28,32 @@ type ArticleTypeListResp struct {
 	AbstractList []*ArticleTypeAndAbstract
 }
 
-//列表
+// 列表
 func GetCygxArticleTypeList() (items []*CygxArticleType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article_type ORDER BY sort DESC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
-//新增
+// 新增
 func AddCygxArticleType(item *CygxArticleType) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newId, err = o.Insert(item)
 	return
 }
 
-//详情
+// 详情
 func GetCygxArticleTypeDetailById(activityTypeId int) (item *CygxArticleType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article_type WHERE article_type_id = ? `
 	err = o.Raw(sql, activityTypeId).QueryRow(&item)
 	return
 }
 
-//获取数量
+// 获取数量
 func GetCygxArticleTypeCount(condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `SELECT COUNT(1) AS count  FROM cygx_article_type WHERE  1=1 ` + condition
 	err = o.Raw(sqlCount).QueryRow(&count)
 	return

models/cygx/banner.go

@@ -34,14 +34,14 @@ type CygxBannerReq struct {
 
 // 添加
 func AddCygxBanner(item *CygxBanner) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }
 
 // 修改
 func UpdateCygxBanner(item *CygxBanner) (err error) {
-	to := orm.NewOrm()
+	to := orm.NewOrmUsingDB("hz_cygx")
 	updateParams := make(map[string]interface{})
 	updateParams["ImgId"] = item.ImgId
 	updateParams["ListType"] = item.ListType
@@ -96,7 +96,7 @@ type GetCygxBannerImgRespDetailResp struct {
 
 // 通过ID获取详情
 func GetCygxBannerDetail(banneId int) (item *CygxBannerResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_banner  WHERE banner_id=? `
 	err = o.Raw(sql, banneId).QueryRow(&item)
 	return
@@ -104,7 +104,7 @@ func GetCygxBannerDetail(banneId int) (item *CygxBannerResp, err error) {
 
 // 获取某一列，最大的排序值
 func GetCygxBannerDetailByListTypeMaxSort(listType string) (item *CygxBanner, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT  * FROM cygx_banner  WHERE  list_type = ? ORDER BY sort DESC   LIMIT 1  `
 	err = o.Raw(sql, listType).QueryRow(&item)
 	return
@@ -112,7 +112,7 @@ func GetCygxBannerDetailByListTypeMaxSort(listType string) (item *CygxBanner, er
 
 // UpdateCygxBannerRespMulti 批量修改banner排序
 func UpdateCygxBannerMulti(items []*CygxBanner) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	p, err := o.Raw(` UPDATE cygx_banner SET sort = ? WHERE banner_id = ?  `).Prepare()
 	if err != nil {
 		return
@@ -133,7 +133,7 @@ func UpdateCygxBannerMulti(items []*CygxBanner) (err error) {
 
 // 修改是否展示
 func EditCygxBannerStatus(status, banneId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_banner SET status=?, modify_time=NOW()   WHERE banner_id=? `
 	_, err = o.Raw(sql, status, banneId).Exec()
 	return
@@ -145,14 +145,14 @@ func GetCygxBannerCount(condition string, pars []interface{}) (count int, err er
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxBannerList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxBannerResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_banner as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -169,7 +169,7 @@ type CygxBannerListResp struct {
 
 // 移动列数并修改排序
 func EditCygxBannerMove(sort, banneId int, listType string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -207,7 +207,7 @@ func EditCygxBannerMove(sort, banneId int, listType string) (err error) {
 
 // 移动列数并修改排序
 func UpdateCygxBannerlistType(sort, banneId int, listType string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_banner SET sort = ?,  list_type =?, modify_time=NOW()  WHERE banner_id=?   `
 	_, err = o.Raw(sql, sort, listType, banneId).Exec()
 

models/cygx/banner_history.go

@@ -22,7 +22,7 @@ type CygxBannerHistory struct {
 
 // 列表
 func GetCygxBannerHistoryList(condition string, pars []interface{}) (items []*CygxBannerHistory, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_banner_history as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -37,7 +37,7 @@ func GetCygxBannerHistoryCount(condition string, pars []interface{}) (count int,
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
@@ -49,7 +49,7 @@ func GetCygxBannerHistoryCountUv(bannerId int) (count int, err error) {
 		FROM
 			( SELECT count(*) FROM cygx_banner_history WHERE 1 = 1 AND banner_id = ? GROUP BY user_id ) b `
 
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, bannerId).QueryRow(&count)
 	return
 }
@@ -57,7 +57,7 @@ func GetCygxBannerHistoryCountUv(bannerId int) (count int, err error) {
 // 获取数量
 func GetCygxBannerHistoryCountPv(bannerId int) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_banner_history as art WHERE 1= 1  AND banner_id = ? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, bannerId).QueryRow(&count)
 	return
 }

models/cygx/banner_img.go

@@ -27,14 +27,14 @@ func GetCygxBannerImgCount(condition string, pars []interface{}) (count int, err
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxBannerImgList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxBannerImgResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_banner_img as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -46,7 +46,7 @@ func GetCygxBannerImgList(condition string, pars []interface{}, startSize, pageS
 
 // 通过ID获取详情
 func GetCygxBannerImgDetail(imgId int) (item *CygxBannerImgResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_banner_img  WHERE img_id=? `
 	err = o.Raw(sql, imgId).QueryRow(&item)
 	return

models/cygx/chart.go

@@ -94,19 +94,12 @@ type CygxChartDetail struct {
 }
 
 func GetChartCountById(chartId int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_chart WHERE chart_id = ? `
 	err = o.Raw(sql, chartId).QueryRow(&count)
 	return
 }
 
-// 新增图表
-func AddCygxChart(item *CygxChart) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}
-
 // 标签分类
 type ChartPtagResultApi struct {
 	Data []ChartPtagResultApidate `json:"data"`
@@ -171,7 +164,7 @@ type ChartCollectReq struct {
 
 // 获取图表列表
 func GetChartList(condition string, pars []interface{}, startSize, pageSize int) (items []*HomeChartListResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_chart AS a WHERE a.publish_status=1 `
 	if condition != "" {
 		sql += condition
@@ -183,7 +176,7 @@ func GetChartList(condition string, pars []interface{}, startSize, pageSize int)
 
 // 获取图表列表
 func GetChartListCollection(chartIds string, userId, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT a.*,
 			t.create_time AS t_create_time,
 			c.create_time AS c_create_time,
@@ -207,7 +200,7 @@ func GetChartListCollection(chartIds string, userId, startSize, pageSize int) (i
 
 // 获取图表列表本地
 func GetChartListCollectionWithCygxByMobile(condition string, startSize, pageSize int) (items []*HomeChartListResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			a.chart_id,a.title,a.title_en,a.ptag_name,a.ctag_name,a.cover,a.iframe,a.ptag_name_two,a.ctag_name_two,
 			r.create_time AS create_date
@@ -225,7 +218,7 @@ func GetChartListCollectionWithCygxByMobile(condition string, startSize, pageSiz
 
 // 获取图表列表本地
 func GetChartListCollectionWithCygx(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			a.chart_id,a.title,a.title_en,a.ptag_name,a.ctag_name,a.cover,a.iframe,a.ptag_name_two,a.ctag_name_two,
 			r.create_time AS create_time
@@ -244,7 +237,7 @@ func GetChartListCollectionWithCygx(condition string, startSize, pageSize int) (
 
 // 获取图表数量
 func GetChartCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count
                 FROM cygx_chart AS a
                 WHERE a.publish_status=1 `
@@ -256,13 +249,15 @@ func GetChartCount(condition string, pars []interface{}) (count int, err error)
 }
 
 func GetChartCountByUser(condition string) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_chart_collect as r INNER JOIN cygx_chart_all AS a ON r.chart_id = a.chart_id  WHERE 1=1   ` + condition
-	err = orm.NewOrm().Raw(sql).QueryRow(&count)
+	err = o.Raw(sql).QueryRow(&count)
 	return
 }
 func GetChartCountByUserMobile(condition string) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_chart_collect as r  INNER JOIN cygx_chart_all AS a ON a.chart_id = r.chart_id  WHERE 1= 1 ` + condition
-	err = orm.NewOrm().Raw(sql).QueryRow(&count)
+	err = o.Raw(sql).QueryRow(&count)
 	return
 }
 
@@ -273,11 +268,17 @@ type CygxChartCollect struct {
 
 // 获取图表列表
 func GetChartCollectList(condition string) (items []*UserInteraction, err error) {
+	//o := orm.NewOrm()
+	//sql := `SELECT u.mobile,u.user_id,u.real_name FROM cygx_chart_collect AS r
+	//		INNER JOIN wx_user AS u ON u.mobile = r.mobile
+	//		LEFT  JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
+	//		WHERE 1= 1 ` + condition + `   GROUP BY r.mobile  ORDER BY ui.chart_count_num DESC `
+	//_, err = o.Raw(sql).QueryRows(&items)
+
 	o := orm.NewOrm()
 	sql := `SELECT u.mobile,u.user_id,u.real_name FROM cygx_chart_collect AS r
-			INNER JOIN wx_user AS u ON u.mobile = r.mobile 
-			LEFT  JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id 
-			WHERE 1= 1 ` + condition + `   GROUP BY r.mobile  ORDER BY ui.chart_count_num DESC `
+			INNER JOIN wx_user AS u ON u.mobile = r.mobile
+			WHERE 1= 1 ` + condition + `   GROUP BY r.mobile `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -285,13 +286,19 @@ func GetChartCollectList(condition string) (items []*UserInteraction, err error)
 // 获取图表列表
 func GetChartCollectBycompanyList(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
 	o := orm.NewOrm()
+	//sql := `SELECT u.mobile,u.user_id,u.real_name,r.company_name,
+	//		cp.seller_name FROM cygx_chart_collect AS r
+	//		INNER JOIN wx_user AS u ON u.user_id = r.user_id
+	//		INNER  JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
+	//		LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
+	//		INNER JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
+	//		WHERE 1= 1 ` + condition + `   GROUP BY r.mobile  ORDER BY ci.chart_count_num DESC , ui.chart_count_num DESC `
+
 	sql := `SELECT u.mobile,u.user_id,u.real_name,r.company_name,
 			cp.seller_name FROM cygx_chart_collect AS r
-			INNER JOIN wx_user AS u ON u.user_id = r.user_id 
-			INNER  JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
+			INNER JOIN wx_user AS u ON u.user_id = r.user_id
 			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
-			INNER JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
-			WHERE 1= 1 ` + condition + `   GROUP BY r.mobile  ORDER BY ci.chart_count_num DESC , ui.chart_count_num DESC `
+			WHERE 1= 1 ` + condition + `   GROUP BY r.mobile   `
 	if startSize > 0 || pageSize > 0 {
 		sql += ` LIMIT ` + strconv.Itoa(startSize) + "," + strconv.Itoa(pageSize)
 	}
@@ -301,38 +308,33 @@ func GetChartCollectBycompanyList(condition string, startSize, pageSize int) (it
 
 // 获取一共有多少用户收藏图表
 func GetChartCountByUserCount(condition string) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
-	COUNT( 1 ) AS count 
-FROM
-	(
-	SELECT
-		COUNT( 1 ) 
-	FROM
-		cygx_chart_collect AS r
-		INNER JOIN wx_user AS u ON u.user_id = r.user_id
-		INNER JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
-		INNER JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id 
-		WHERE 1= 1 ` + condition + ` GROUP BY u.user_id ) AS count`
-	err = orm.NewOrm().Raw(sql).QueryRow(&count)
+			COUNT( 1 ) AS count 
+		FROM
+			(
+			SELECT
+				COUNT( 1 ) 
+			FROM
+				cygx_chart_collect AS r
+				INNER JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
+				INNER JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id 
+				WHERE 1= 1 ` + condition + ` GROUP BY u.user_id ) AS count`
+	err = o.Raw(sql).QueryRow(&count)
 	return
 }
 
 func GetChartCountBySeller(condition string) (list []*company.CompanyReportRecordGroup, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-	p.seller_id AS admin_id,
 	count(
 	DISTINCT ( r.company_id )) num,
 	GROUP_CONCAT( DISTINCT r.company_id SEPARATOR ',' ) AS company_ids 
 FROM
 	cygx_chart_collect AS r
 	INNER JOIN cygx_chart_all AS a ON a.chart_id = r.chart_id
-	INNER JOIN company_product AS p ON p.company_id = r.company_id 
 WHERE
-	1 = 1 
-	AND p.product_id = 2  ` + condition
-
-	sql += ` GROUP BY p.seller_id `
+	1 = 1  ` + condition
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }

models/cygx/chart_permission.go

@@ -29,7 +29,7 @@ func GetChartPermissionAll() (items []*ChartPermission, err error) {
 	return
 }
 
-//获取带有ICo的产业
+// 获取带有ICo的产业
 func GetChartPermissionIco(condition string) (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM chart_permission  WHERE 1=1 `
@@ -41,7 +41,7 @@ func GetChartPermissionIco(condition string) (items []*ChartPermission, err erro
 	return
 }
 
-//获取带有ICo的产业
+// 获取带有ICo的产业
 func GetChartPermissionIcoNew(condition string) (items []*CygxRSlChartPermissionIcoTmp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE 1=1 `
@@ -53,7 +53,7 @@ func GetChartPermissionIcoNew(condition string) (items []*CygxRSlChartPermission
 	return
 }
 
-//获取带有ICo的产业
+// 获取带有ICo的产业
 func GetChartPermissionIcoDetail(condition string) (items []*CygxRSlChartPermissionIco, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE 1=1 `
@@ -65,7 +65,7 @@ func GetChartPermissionIcoDetail(condition string) (items []*CygxRSlChartPermiss
 	return
 }
 
-//获取带有ICo的产业
+// 获取带有ICo的产业
 func GetChartPermissionDetail(condition string) (items []*CygxReportSelectionChart, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE 1=1 `
@@ -77,7 +77,7 @@ func GetChartPermissionDetail(condition string) (items []*CygxReportSelectionCha
 	return
 }
 
-//没有策略的顶级分类
+// 没有策略的顶级分类
 func GetChartPermissionAllNoTactics() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 AND is_report=1 AND chart_permission_id != 23 AND is_other = 0 AND permission_type != 2   ORDER BY sort ASC   `
@@ -92,7 +92,7 @@ func GetChartPermissionOtherAll() (items []*ChartPermission, err error) {
 	return
 }
 
-//获取产业数量
+// 获取产业数量
 func GetChartPermissionCount(condition string, pars []interface{}) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM chart_permission WHERE 1=1 `
 	if condition != "" {
@@ -103,7 +103,7 @@ func GetChartPermissionCount(condition string, pars []interface{}) (count int, e
 	return
 }
 
-//通过ID获取分类详情
+// 通过ID获取分类详情
 func GetCategoryInfoById(chartPermissionId int) (item *ChartPermission, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id=?`
@@ -111,7 +111,7 @@ func GetCategoryInfoById(chartPermissionId int) (item *ChartPermission, err erro
 	return
 }
 
-//通过名称获取分类详情
+// 通过名称获取分类详情
 func GetCategoryInfoByName(name string) (item *ChartPermission, err error) {
 	if name == "宏观" {
 		name = "宏观经济"
@@ -122,7 +122,7 @@ func GetCategoryInfoByName(name string) (item *ChartPermission, err error) {
 	return
 }
 
-//报告分类映射类型
+// 报告分类映射类型
 type ReportMapping struct {
 	CategoryId        int    `description:"匹配ID"`
 	MatchTypeName     string `description:"匹配类型"`
@@ -131,14 +131,14 @@ type ReportMapping struct {
 }
 
 func GetReportMapping() (item []*ReportMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT *  FROM	cygx_report_mapping WHERE	match_type_name != ''  `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
 }
 
 func GetReportMappingDetail(condition string, pars []interface{}) (item *ReportMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT *  FROM	cygx_report_mapping WHERE	 1= 1  ` + condition + ` LIMIT 1 `
 	err = o.Raw(sql, pars).QueryRow(&item)
 	return

models/cygx/company_user_type.go

@@ -16,13 +16,13 @@ type CygxCompanyUserType struct {
 
 // 新增权益客户身份类型
 func AddCygxCompanyUserType(item *CygxCompanyUserType) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }
 
 func GetCygxCompanyUserTypeByCompanyId(companyId int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_company_user_type AS a WHERE a.company_id=?  `
 	err = o.Raw(sql, companyId).QueryRow(&count)
 	return
@@ -30,7 +30,7 @@ func GetCygxCompanyUserTypeByCompanyId(companyId int) (count int, err error) {
 
 // CygxCompanyUserType 更新权益客户身份类型
 func UpdateCygxCompanyUserType(companyId, useType int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_company_user_type SET customer_type_id=? WHERE company_id=? `
 	_, err = o.Raw(sql, useType, companyId).Exec()
 	return
@@ -38,7 +38,7 @@ func UpdateCygxCompanyUserType(companyId, useType int) (err error) {
 
 // 通过活动ID获取详情
 func GetCygxCompanyUserType(companyId int) (item *CygxCompanyUserType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_company_user_type AS a WHERE a.company_id=?  `
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	return
@@ -46,7 +46,7 @@ func GetCygxCompanyUserType(companyId int) (item *CygxCompanyUserType, err error
 
 // 获取大套餐客户列表
 func GetCygxCompanyUserTypeList() (items []*CygxCompanyUserType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_company_user_type AS a WHERE a.customer_type_id=2  `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -54,7 +54,7 @@ func GetCygxCompanyUserTypeList() (items []*CygxCompanyUserType, err error) {
 
 // CygxCompanyUserType 更新权益客户身份类型
 func UpdateCygxCompanyUserTypeAndPackageType(companyId, useType, packageType int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_company_user_type SET customer_type_id=?, package_type = ? WHERE company_id=? `
 	_, err = o.Raw(sql, useType, packageType, companyId).Exec()
 	return

models/cygx/config.go

@@ -18,25 +18,25 @@ type NameAndUrlList struct {
 	List []*NameAndUrl
 }
 
-//详情
+// 详情
 func GetCygxConfigDetail() (item *CygxConfig, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_config  WHERE config_code= 'is_show_sustainable'`
 	err = o.Raw(sql).QueryRow(&item)
 	return
 }
 
-//修改
+// 修改
 func CygxConfigUpdate(newValue int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_config SET  config_value=?   WHERE config_code= 'is_show_sustainable'`
 	_, err = o.Raw(sql, newValue).Exec()
 	return
 }
 
-//详情
+// 详情
 func GetCygxConfigDetailByCode(code string) (item *CygxConfig, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_config  WHERE config_code= ?`
 	err = o.Raw(sql, code).QueryRow(&item)
 	return

models/cygx/cygx_activity_special_points_company.go

@@ -9,7 +9,7 @@ type CygxActivitySpecialInheritPointsCompany struct {
 	Id                  int       `orm:"column(id);pk"`
 	CompanyId           int       // 公司ID
 	CompanyName         string    // 公司名称
-	Points              int   // 公司剩余点数
+	Points              int       // 公司剩余点数
 	CreateTime          time.Time // 创建时间
 	ModifyTime          time.Time // 更新时间
 	ChartPermissionId   int       // 品种ID
@@ -17,7 +17,7 @@ type CygxActivitySpecialInheritPointsCompany struct {
 }
 
 func AddCygxActivitySpecialPointsCompany(item *CygxActivitySpecialInheritPointsCompany) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	if err != nil {
 		return
@@ -26,14 +26,14 @@ func AddCygxActivitySpecialPointsCompany(item *CygxActivitySpecialInheritPointsC
 }
 
 func AddCygxActivitySpecialInheritPointsCompanyMulti(items []*CygxActivitySpecialInheritPointsCompany) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func GetCygxActivitySpecialInheritPointsByCompanyId(companyId int) (list []*CygxActivitySpecialInheritPointsCompany, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_activity_special_inherit_points_company WHERE company_id = ?  `
-	_, err = o.Raw(sql,companyId).QueryRows(&list)
+	_, err = o.Raw(sql, companyId).QueryRows(&list)
 	return
-}
+}

models/cygx/cygx_morning_meeting_review_chapter.go

@@ -40,14 +40,14 @@ type AddMorningMeetingReviewsReq struct {
 
 // 添加晨报点评章节
 func AddCygxMorningMeetingReviewChapter(item *CygxMorningMeetingReviewChapter) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }
 
 // 列表
 func GetCygxMorningMeetingReviewsListById(meetingId int) (items []*CygxMorningMeetingReviewChapter, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_morning_meeting_review_chapter WHERE meeting_id = ? `
 	_, err = o.Raw(sql, meetingId).QueryRows(&items)
 	return
@@ -55,7 +55,7 @@ func GetCygxMorningMeetingReviewsListById(meetingId int) (items []*CygxMorningMe
 
 // 列表
 func GetCygxMorningMeetingReviewChapterList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxMorningMeetingReviewChapter, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_morning_meeting_review_chapter WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -92,7 +92,7 @@ type CygxMorningMeetingReviewChapterResp struct {
 
 // 删除晨会点评章节
 func DeleteMorningMeetingChapter(reviewId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_morning_meeting_review_chapter WHERE meeting_id =? `
 	_, err = o.Raw(sql, reviewId).Exec()
 	return
@@ -100,7 +100,7 @@ func DeleteMorningMeetingChapter(reviewId int) (err error) {
 
 // 更新晨报点评章节
 func UpdateCygxMorningMeetingReviewChapter(item *CygxMorningMeetingReviewChapter) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_morning_meeting_review_chapter
 			SET
 			  meeting_time =?,
@@ -119,7 +119,7 @@ func UpdateCygxMorningMeetingReviewChapter(item *CygxMorningMeetingReviewChapter
 }
 
 func GetCygxMorningMeetingReviewsListByIdAndIndustryId(meetingId, industryId int) (item *CygxMorningMeetingReviewChapter, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_morning_meeting_review_chapter WHERE meeting_id = ? AND industry_id = ? `
 	err = o.Raw(sql, meetingId, industryId).QueryRow(&item)
 	return
@@ -127,7 +127,7 @@ func GetCygxMorningMeetingReviewsListByIdAndIndustryId(meetingId, industryId int
 
 // 删除晨会点评章节
 func DeleteMorningMeetingChapterById(chapterId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_morning_meeting_review_chapter WHERE id =? `
 	_, err = o.Raw(sql, chapterId).Exec()
 	return
@@ -145,7 +145,7 @@ type CygxMorningMeetingGather struct {
 
 // 列表
 func GetCygxMorningMeetingGatherList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxMorningMeetingGather, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_morning_meeting_gather WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -157,7 +157,7 @@ func GetCygxMorningMeetingGatherList(condition string, pars []interface{}, start
 
 // 更改
 func UpdateCygxMorningMeetingGather(meetingIds string, meetingGatherId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` UPDATE cygx_morning_meeting_gather SET meeting_ids=? WHERE id =?  `
 	_, err = o.Raw(sql, meetingIds, meetingGatherId).Exec()
 	return
@@ -165,7 +165,7 @@ func UpdateCygxMorningMeetingGather(meetingIds string, meetingGatherId int) (err
 
 // 详情
 func GetCygxMorningMeetingReviewChapterDetail(meetingGatherId int) (item *CygxMorningMeetingReviewChapter, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_morning_meeting_review_chapter  WHERE id= ? `
 	err = o.Raw(sql, meetingGatherId).QueryRow(&item)
 	return
@@ -173,7 +173,7 @@ func GetCygxMorningMeetingReviewChapterDetail(meetingGatherId int) (item *CygxMo
 
 // 获取数量
 func GetCygxMorningMeetingReviewChapterCount(cid int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT
 				COUNT( 1 ) AS count 
 			FROM

models/cygx/cygx_morning_meeting_reviews.go

@@ -19,16 +19,16 @@ type CygxMorningMeetingReviews struct {
 	IndustryNames string    `json:"industryName"` // 产业名称
 }
 
-//添加晨报点评
+// 添加晨报点评
 func AddCygxMorningMeetingReviews(item *CygxMorningMeetingReviews) (id int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	id, err = o.Insert(item)
 	return
 }
 
-//列表
+// 列表
 func GetCygxMorningMeetingReviewsList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxMorningMeetingReviews, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_morning_meeting_reviews WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -39,7 +39,7 @@ func GetCygxMorningMeetingReviewsList(condition string, pars []interface{}, star
 }
 
 func GetCygxMorningMeetingReviewsListCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_morning_meeting_reviews WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -65,7 +65,7 @@ type CygxMorningMeetingReviewsList struct {
 }
 
 func GetMorningMeetingReviewById(reviewId int) (item *CygxMorningMeetingReviews, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_morning_meeting_reviews WHERE id=?`
 	err = o.Raw(sql, reviewId).QueryRow(&item)
 	return
@@ -73,7 +73,7 @@ func GetMorningMeetingReviewById(reviewId int) (item *CygxMorningMeetingReviews,
 
 // 发布报告
 func PublishMorningMeetingReviewById(reviewId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_morning_meeting_reviews SET status=1,publish_time=now(),modify_time=NOW() WHERE id = ? `
 	_, err = o.Raw(sql, reviewId).Exec()
 	return
@@ -87,9 +87,9 @@ type MorningReviewPublishCancelReq struct {
 	ReviewId int `description:"晨会id"`
 }
 
-//取消发布报告
+// 取消发布报告
 func PublishCancelMorningMeetingReview(reviewId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` UPDATE cygx_morning_meeting_reviews SET status=0,publish_time=null WHERE id =?  `
 	_, err = o.Raw(sql, reviewId).Exec()
 	return
@@ -126,17 +126,17 @@ func DeleteMorningReviewAndChapter(reviewId int) (err error) {
 	return
 }
 
-//删除晨会点评
+// 删除晨会点评
 func DeleteMorningMeeting(reviewId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_morning_meeting_reviews WHERE id =? `
 	_, err = o.Raw(sql, reviewId).Exec()
 	return
 }
 
-//更新晨报点评
+// 更新晨报点评
 func UpdateCygxMorningMeetingReviews(item *CygxMorningMeetingReviews) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_morning_meeting_reviews
 			SET
 			  meeting_time =?,

models/cygx/cygx_report_mapping.go

@@ -15,7 +15,7 @@ type CygxReportMappingListRep struct {
 
 // 主题列表
 func CygxReportMappingist(chartPermissionId int) (items []*CygxReportMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT sub_category_name FROM cygx_report_mapping WHERE  chart_permission_id = ? GROUP BY sub_category_name`
 	_, err = o.Raw(sql, chartPermissionId).QueryRows(&items)
 	return
@@ -31,7 +31,7 @@ type CygxReportMappingMatchTypeRep struct {
 
 // 主题列表
 func CygxReportMappingMatchTypeList() (items []*CygxReportMappingMatchType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT match_type_name FROM cygx_report_mapping WHERE report_type = 2  GROUP BY match_type_name`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -39,7 +39,7 @@ func CygxReportMappingMatchTypeList() (items []*CygxReportMappingMatchType, err
 
 // 主题列表所有
 func CygxReportMappingMatchTypeListAll() (items []*CygxReportMappingMatchType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT match_type_name FROM cygx_report_mapping WHERE match_type_name  != ''  GROUP BY match_type_name`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -47,7 +47,7 @@ func CygxReportMappingMatchTypeListAll() (items []*CygxReportMappingMatchType, e
 
 // 主题列表
 func CygxReportMappingMatchTypeListExcel() (items []*CygxReportMappingMatchType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT match_type_name FROM cygx_report_mapping WHERE report_type = 2 AND chart_permission_id != 23 GROUP BY match_type_name`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -62,7 +62,7 @@ func GetReportCount(chartPermissionId, industrialManagementId int, matchTypeName
 	WHERE re.chart_permission_id = ? 
     AND man_g.industrial_management_id = ?
 	AND re.match_type_name = ` + "'" + matchTypeName + "'"
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, chartPermissionId, industrialManagementId).QueryRow(&recount)
 	return
 }
@@ -76,21 +76,21 @@ type ReportMappingRep struct {
 }
 
 func GetMatchTypeNameById(Id int) (item *ReportMappingRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping WHERE id = ? `
 	err = o.Raw(sql, Id).QueryRow(&item)
 	return
 }
 
 func GetMatchTypeNameByPermissionId(permissionId int) (item *ReportMappingRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT category_id FROM cygx_report_mapping WHERE chart_permission_id = ? AND category_id IN (1004,1005,1006,1007) AND report_type = 2 LIMIT 1 `
 	err = o.Raw(sql, permissionId).QueryRow(&item)
 	return
 }
 
 func GetMatchTypeNameByKeyword(keyWord string) (items []*CygxReportMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			* 
 		FROM

models/cygx/cygx_tag.go

@@ -22,13 +22,13 @@ type CygxTag struct {
 
 // 添加标签
 func AddCygxTag(item *CygxTag) (id int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	id, err = o.Insert(item)
 	return
 }
 
 func (m *CygxTag) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Update(m, cols...)
 	return
 }
@@ -52,7 +52,7 @@ type CygxTagList struct {
 
 // 获取tag列表
 func GetCygxTagList(cond string) (items []*CygxTagList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_tag  WHERE 1=1 AND status = 1 `
 	if cond != "" {
 		sql += cond
@@ -65,7 +65,7 @@ func GetCygxTagList(cond string) (items []*CygxTagList, err error) {
 
 // 获取tag列表-总数
 func GetCygxTagListCount(cond string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_tag  WHERE 1=1  `
 	if cond != "" {
 		sql += cond
@@ -78,7 +78,7 @@ func GetCygxTagListCount(cond string) (count int, err error) {
 
 // 获取tag列表-分页
 func GetCygxTagListPage(cond string, startSize, pageSize int) (items []*CygxTagList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *,
 		(SELECT COUNT(1) FROM cygx_tag_history AS avr WHERE avr.tag_id=cygx_tag.tag_id) AS pv,
         (SELECT COUNT(DISTINCT user_id) FROM cygx_tag_history AS avr WHERE avr.tag_id=cygx_tag.tag_id) AS uv
@@ -94,7 +94,7 @@ func GetCygxTagListPage(cond string, startSize, pageSize int) (items []*CygxTagL
 }
 
 func UpdateCygxTagStatus(id, status int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ``
 	if status == 1 {
 		sql = ` UPDATE  cygx_tag
@@ -117,7 +117,7 @@ func UpdateCygxTagStatus(id, status int) (err error) {
 
 // GetCygxTagByTagId 根据指标id获取指标信息
 func GetCygxTagByTagId(tagId int) (item *CygxTag, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_tag WHERE tag_id=? `
 	err = o.Raw(sql, tagId).QueryRow(&item)
 	return
@@ -125,7 +125,7 @@ func GetCygxTagByTagId(tagId int) (item *CygxTag, err error) {
 
 // GetCygxTagMinSort 获取最小不等于0的排序
 func GetCygxTagMinSort() (sort int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT min(sort) FROM cygx_tag WHERE  sort <> 0 `
 	err = o.Raw(sql).QueryRow(&sort)
 	return
@@ -133,7 +133,7 @@ func GetCygxTagMinSort() (sort int, err error) {
 
 // MoveDownCygxTagBySort 往下移动
 func MoveDownCygxTagBySort(prevSort, currentSort int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `update cygx_tag set sort = sort - 1 where sort <= ? and sort> ? `
 	_, err = o.Raw(sql, prevSort, currentSort).Exec()
 	return
@@ -141,7 +141,7 @@ func MoveDownCygxTagBySort(prevSort, currentSort int) (err error) {
 
 // MoveUpCygxTagBySort 往下移动
 func MoveUpCygxTagBySort(prevSort, currentSort int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `update cygx_tag set sort = sort + 1 where sort >= ? and sort< ? `
 	_, err = o.Raw(sql, prevSort, currentSort).Exec()
 	return
@@ -149,7 +149,7 @@ func MoveUpCygxTagBySort(prevSort, currentSort int) (err error) {
 
 // GetCygxTagMaxSort 获取最大不等于0的排序
 func GetCygxTagMaxSort() (sort int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT max(sort) FROM cygx_tag WHERE  sort <> 0 `
 	err = o.Raw(sql).QueryRow(&sort)
 	return

models/cygx/cygx_user.go

@@ -109,8 +109,7 @@ func GetCygxCompanyUserList(userCondition, keyWord, kwywordcondition, condition,
 			cp.try_stage,
 			cp.package_type,
 			m.real_name as seller_name ,
-			( SELECT COUNT( 1 ) FROM user_remarks AS rm  WHERE rm.user_id = u.user_id ) AS is_show_see_num,
-			( SELECT COUNT( 1 ) FROM cygx_user_remind AS rm  WHERE rm.user_id = u.user_id ) AS is_remind
+			( SELECT COUNT( 1 ) FROM user_remarks AS rm  WHERE rm.user_id = u.user_id ) AS is_show_see_num
 		FROM
 			wx_user AS u
 			INNER JOIN company AS c ON c.company_id = u.company_id
@@ -181,6 +180,7 @@ func GetCygxCompanyUserListByNoLoss() (items []*CygxCompanyUserAndSellerResp, er
 
 // 对于上面的SQL的拆分优化查询速度
 func GetCygxCompanyUserListSplit(userIds string) (items []*CygxCompanyUser, err error) {
+	return
 	o := orm.NewOrm()
 	sql := `SELECT
 			u.user_id,
@@ -392,7 +392,7 @@ type CygxChartResp struct {
 
 // 获取阅读记录数量
 func GetCygxArticleHistoryCount(mobile, email, condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article_history_record_all as r  INNER JOIN cygx_article  as art  ON  art.article_id = r.article_id  WHERE   r.mobile  = '` + mobile + `'  AND is_del = 0 ` + condition
 	err = o.Raw(sqlCount).QueryRow(&count)
 	return
@@ -400,7 +400,7 @@ func GetCygxArticleHistoryCount(mobile, email, condition string) (count int, err
 
 // 阅读记录列表
 func GetCygxArticleHistoryRecordByUser(mobile, email, condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			art.title,
 			art.article_id,
@@ -445,7 +445,7 @@ func GetCygxArticleHistoryRecordByUser(mobile, email, condition string, startSiz
 
 // 用户阅读记录列表 2023-08-02 优化拆分
 func GetCygxArticleHistoryRecordByUserNew(mobile, email, condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			art.title,
 			art.article_id,
@@ -470,7 +470,7 @@ func GetCygxArticleHistoryRecordByUserNew(mobile, email, condition string, start
 
 // 收藏列表数量
 func GetCygxArticleCollectCount(uid int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article_collect as r INNER JOIN cygx_article AS art ON art.article_id = r.article_id  WHERE   user_id = ?  `
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
@@ -478,7 +478,7 @@ func GetCygxArticleCollectCount(uid int) (count int, err error) {
 
 // 收藏列表
 func GetCygxArticleCollectByUser(uid, startSize, pageSize int, condition string) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			art.title,
 			art.article_id,
@@ -521,7 +521,7 @@ func GetCygxArticleCollectByUser(uid, startSize, pageSize int, condition string)
 
 // 关注作者数量
 func GetCygArticleDepartmentFollowCount(uid int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article_department_follow  WHERE   user_id = ?   AND type = 1  `
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
@@ -529,7 +529,7 @@ func GetCygArticleDepartmentFollowCount(uid int) (count int, err error) {
 
 // 关注作者列表
 func GetCygArticleDepartmentFollowByUser(uid, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			m.department_id,
 			m.nick_name,
@@ -546,7 +546,7 @@ func GetCygArticleDepartmentFollowByUser(uid, startSize, pageSize int) (items []
 			LEFT JOIN cygx_article AS a ON a.department_id = m.department_id
 			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
 			LEFT JOIN cygx_industrial_management AS i ON i.industrial_management_id = mg.industrial_management_id 
-			WHERE user_id = ? AND f.type = 1  GROUP BY m.department_id 
+			WHERE f.user_id = ? AND f.type = 1  GROUP BY m.department_id 
 			ORDER BY  f.create_time DESC LIMIT ?,? `
 	_, err = o.Raw(sql, uid, startSize, pageSize).QueryRows(&items)
 	return
@@ -554,7 +554,7 @@ func GetCygArticleDepartmentFollowByUser(uid, startSize, pageSize int) (items []
 
 // 用户搜索关键词统计
 func GetCygxSearchKeyWordCount(uid int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_search_key_word  WHERE   user_id = ?  `
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
@@ -562,7 +562,7 @@ func GetCygxSearchKeyWordCount(uid int) (count int, err error) {
 
 // 用户搜索关键词列表
 func GetCygxSearchKeyWordByUser(uid, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			key_word,create_time
 		FROM
@@ -575,13 +575,12 @@ func GetCygxSearchKeyWordByUser(uid, startSize, pageSize int) (items []*UserInte
 
 // 用户专项产业调研统计
 func GetCygxActivitySpecialTripCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `SELECT
 	COUNT( 1 ) 
 FROM
 	cygx_activity_special_meeting_detail AS h
 	INNER JOIN cygx_activity_special AS a ON a.activity_id = h.activity_id
-	INNER JOIN wx_user AS u ON h.mobile = u.mobile 
 WHERE
 	1 = 1 
 	AND a.publish_status = 1 AND a.activity_time_end < NOW() ` + condition
@@ -591,7 +590,7 @@ WHERE
 
 // 用户专项产业调研列表
 func GetCygxActivitySpecialTripByUser(uid, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.research_theme AS activity_name,
 			a.chart_permission_name,
@@ -603,7 +602,6 @@ func GetCygxActivitySpecialTripByUser(uid, startSize, pageSize int) (items []*Us
 		FROM
 			cygx_activity_special_meeting_detail AS h
 			INNER JOIN cygx_activity_special AS a ON a.activity_id = h.activity_id
-			INNER JOIN wx_user AS u ON h.mobile = u.mobile 
 		WHERE
 			1 = 1
 			 AND a.publish_status = 1 AND a.activity_time_end < NOW()
@@ -615,7 +613,7 @@ func GetCygxActivitySpecialTripByUser(uid, startSize, pageSize int) (items []*Us
 
 // 用户音视频浏览统计
 func GetCygxRoadshowCount(uid int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `SELECT
 	COUNT( 1 ) total 
 FROM
@@ -625,25 +623,22 @@ FROM
 	FROM
 		cygx_micro_roadshow_video_history AS r
 		INNER JOIN cygx_micro_roadshow_video AS v ON r.video_id = v.video_id
-		INNER JOIN wx_user AS u ON r.mobile = u.mobile 
 	WHERE
-		u.user_id = ? UNION ALL
+		r.user_id = ? UNION ALL
 	SELECT
 		"" 
 	FROM
 		cygx_activity_video_history AS r
 		INNER JOIN cygx_activity_video AS v ON r.video_id = v.video_id
-		INNER JOIN wx_user AS u ON r.mobile = u.mobile 
 	WHERE
-		u.user_id = ? UNION ALL
+		r.user_id = ? UNION ALL
 	SELECT
 		"" 
 	FROM
 		cygx_activity_voice_history AS r
 		INNER JOIN cygx_activity_voice AS v ON r.activity_id = v.activity_id
-		INNER JOIN wx_user AS u ON r.mobile = u.mobile 
 	WHERE
-	u.user_id = ? 
+	r.user_id = ? 
 	)z  `
 	err = o.Raw(sqlCount, uid, uid, uid).QueryRow(&count)
 	return
@@ -651,7 +646,7 @@ FROM
 
 // 用户专项产业调研列表
 func GetCygxRoadshowByUser(uid, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			v.video_name AS media_title,
 			r.create_time,
@@ -659,9 +654,8 @@ func GetCygxRoadshowByUser(uid, startSize, pageSize int) (items []*UserInteracti
 		FROM
 			cygx_micro_roadshow_video_history AS r
 			INNER JOIN cygx_micro_roadshow_video AS v ON r.video_id = v.video_id
-			INNER JOIN wx_user AS u ON r.mobile = u.mobile 
 		WHERE
-			u.user_id = ? UNION ALL
+			r.user_id = ? UNION ALL
 		SELECT
 			v.video_name AS media_title,
 			r.create_time,
@@ -669,9 +663,8 @@ func GetCygxRoadshowByUser(uid, startSize, pageSize int) (items []*UserInteracti
 		FROM
 			cygx_activity_video_history AS r
 			INNER JOIN cygx_activity_video AS v ON r.video_id = v.video_id
-			INNER JOIN wx_user AS u ON r.mobile = u.mobile 
 		WHERE
-			u.user_id = ? UNION ALL
+			r.user_id = ? UNION ALL
 		SELECT
 			v.voice_name AS media_title,
 			r.create_time,
@@ -681,7 +674,7 @@ func GetCygxRoadshowByUser(uid, startSize, pageSize int) (items []*UserInteracti
 			INNER JOIN cygx_activity_voice AS v ON r.activity_id = v.activity_id
 			INNER JOIN wx_user AS u ON r.mobile = u.mobile 
 		WHERE
-			u.user_id = ?
+			r.user_id = ?
 		ORDER BY create_time DESC   LIMIT ?,? `
 	_, err = o.Raw(sql, uid, uid, uid, startSize, pageSize).QueryRows(&items)
 	return
@@ -689,7 +682,7 @@ func GetCygxRoadshowByUser(uid, startSize, pageSize int) (items []*UserInteracti
 
 // 线上已到会列表
 func GetAttendanceDetailListByUser(isMeeting int, mobile string, startSize, pageSize int) (item []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			s.signup_type,
 			a.activity_name,
@@ -727,7 +720,7 @@ func GetAttendanceDetailListByUser(isMeeting int, mobile string, startSize, page
 
 // 线上未来到会列表
 func GetAttendanceDetailListNoMeetingByUser(isMeeting int, mobile string, startSize, pageSize int) (item []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			s.signup_type,
 			a.activity_name,
@@ -759,7 +752,7 @@ func GetAttendanceDetailListNoMeetingByUser(isMeeting int, mobile string, startS
 
 // 用户参会统计
 func GetAttendanceDetaiCount(mobile string, meetType, isMeeting int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT
 				COUNT( DISTINCT a.activity_id )  as count 
 		FROM
@@ -782,7 +775,7 @@ func GetAttendanceDetaiCount(mobile string, meetType, isMeeting int) (count int,
 
 // 线下已到会列表
 func GetAttendanceOfflineListByUser(isMeeting int, mobile string, startSize, pageSize int) (item []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.activity_name,
 			a.chart_permission_name,
@@ -812,7 +805,7 @@ func GetAttendanceOfflineListByUser(isMeeting int, mobile string, startSize, pag
 
 // 获取用户参会记录数量
 func GetActivityMeetByUserCount(condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT
 				COUNT( DISTINCT a.activity_id )  as count 
 		FROM
@@ -831,7 +824,7 @@ func GetActivityMeetByUserCount(condition string) (count int, err error) {
 
 // 获取用户参会记录
 func GetActivityMeetByUser(condition string, startSize, pageSize int) (item []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			t.activity_type,
 			s.signup_type,
@@ -867,7 +860,7 @@ func GetActivityMeetByUser(condition string, startSize, pageSize int) (item []*U
 
 // 获取用户参会记录
 func GetActivitySpecialMeetByUser(condition string, startSize, pageSize int) (item []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 	a.activity_id,
 	a.research_theme AS activity_name,
@@ -911,6 +904,7 @@ type GetUserInteractionTableCountResp struct {
 
 // 用户互动总数统计
 func GetUserInteractionTableCount(uid int) (item *GetUserInteractionTableCountResp, err error) {
+	return
 	o := orm.NewOrm()
 	sql := `SELECT
 			( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h  INNER JOIN cygx_article  as art  ON  art.article_id = h.article_id  WHERE h.mobile = u.mobile AND h.is_del = 0 OR ( h.email = u.email  AND h.email <>'' AND h.is_del = 0) ) AS history_num,
@@ -965,7 +959,7 @@ type ArticlePvCountResp struct {
 
 // 阅读记录
 func GetArticlePvCount(mobile, email, dateTime string) (item []*ArticlePvCountResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			article_id,
 			COUNT(article_id) as pv
@@ -989,7 +983,7 @@ type ArticleIndustryNameResp struct {
 
 // 产业名称
 func GetArticleGroupyIndustryName(articleIds string) (item []*ArticleIndustryNameResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			art.article_id,
 			(
@@ -1021,7 +1015,7 @@ func GetArticleGroupyIndustryName(articleIds string) (item []*ArticleIndustryNam
 
 // 标的名称
 func GetArticleGroupySubjectName(articleIds string) (item []*ArticleIndustryNameResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			article_id,
 			subject_name 
@@ -1045,7 +1039,7 @@ type ActivityLabelCountResp struct {
 
 // 活动标签记录(我的日程)
 func GetActivitySignCount(mobile, dateTime string) (item []*ActivityLabelCountResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			label ,
 			COUNT( label ) AS pv 
@@ -1063,7 +1057,7 @@ func GetActivitySignCount(mobile, dateTime string) (item []*ActivityLabelCountRe
 
 // 活动标签记录(会议提醒)
 func GetActivityMeetingReminder(mobile, dateTime string) (item []*ActivityLabelCountResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			label ,
 			COUNT( label ) AS pv 
@@ -1087,7 +1081,7 @@ func GetCygxArticleCollectId(uid int, dateTime string) (articleIds string, err e
 		WHERE
 			user_id = ? 
 			AND create_time >= ?  `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql, uid, dateTime).QueryRow(&articleIds)
 	return
 }

models/cygx/cygx_user_company.go

@@ -7,54 +7,54 @@ import (
 )
 
 // 用户互动总数统计
-func GetUserInteractionTableCountByCompany(companyId int) (item *GetUserInteractionTableCountResp, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h  INNER JOIN cygx_article  as art  ON  art.article_id = h.article_id  WHERE h.company_id = u.company_id AND h.is_del = 0   AND h.create_time < date_format(now(),'%Y-%m-%d') ) AS history_num,
-			( SELECT COUNT( 1 ) FROM cygx_article_collect AS h WHERE h.company_id = u.company_id    AND h.create_time < date_format(now(),'%Y-%m-%d') ) AS count_num,
-			( SELECT COUNT( 1 ) FROM cygx_chart_collect   AS h  INNER JOIN cygx_chart AS a ON h.chart_id = a.chart_id  WHERE h.company_id = u.company_id   AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS chart_num,
-			( SELECT COUNT( 1 ) FROM cygx_industry_fllow AS h WHERE h.company_id = u.company_id AND h.type = 1   AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS industry_fllow_num,
-			( SELECT COUNT( 1 ) FROM cygx_article_department_follow AS h WHERE h.company_id = u.company_id  AND h.type = 1   AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS department_follow_num,
-			( SELECT COUNT( 1 ) FROM cygx_search_key_word AS h WHERE h.company_id = u.company_id   AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS key_word_num,
-			( SELECT 	COUNT(1 )  as count  FROM cygx_activity_signup AS h INNER JOIN cygx_activity as a ON a.activity_id = h.activity_id  INNER JOIN cygx_activity_type as t ON t.activity_type_id = a.activity_type_id  INNER JOIN wx_user as wu  ON wu.user_id = h.user_id  WHERE h.company_id = u.company_id  
-					  AND t.activity_type=1 AND h.do_fail_type = 0   AND h.create_time < date_format(now(),'%Y-%m-%d') ) AS on_line_num,
-			( SELECT  	COUNT( 1 )  as count  FROM cygx_activity_signup AS h INNER JOIN cygx_activity as a ON a.activity_id = h.activity_id  INNER JOIN cygx_activity_type as t ON t.activity_type_id = a.activity_type_id  INNER JOIN wx_user as wu  ON wu.user_id = h.user_id WHERE h.company_id = u.company_id  
-					 AND t.activity_type = 0 AND h.do_fail_type = 0 AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS office_num
-		FROM
-			company  as u
-		WHERE
-			u.company_id = ?`
-	err = o.Raw(sql, companyId).QueryRow(&item)
-	return
-}
+//func GetUserInteractionTableCountByCompany(companyId int) (item *GetUserInteractionTableCountResp, err error) {
+//	o := orm.NewOrm()
+//	sql := `SELECT
+//			( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h  INNER JOIN cygx_article  as art  ON  art.article_id = h.article_id  WHERE h.company_id = u.company_id AND h.is_del = 0   AND h.create_time < date_format(now(),'%Y-%m-%d') ) AS history_num,
+//			( SELECT COUNT( 1 ) FROM cygx_article_collect AS h WHERE h.company_id = u.company_id    AND h.create_time < date_format(now(),'%Y-%m-%d') ) AS count_num,
+//			( SELECT COUNT( 1 ) FROM cygx_chart_collect   AS h  INNER JOIN cygx_chart AS a ON h.chart_id = a.chart_id  WHERE h.company_id = u.company_id   AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS chart_num,
+//			( SELECT COUNT( 1 ) FROM cygx_industry_fllow AS h WHERE h.company_id = u.company_id AND h.type = 1   AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS industry_fllow_num,
+//			( SELECT COUNT( 1 ) FROM cygx_article_department_follow AS h WHERE h.company_id = u.company_id  AND h.type = 1   AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS department_follow_num,
+//			( SELECT COUNT( 1 ) FROM cygx_search_key_word AS h WHERE h.company_id = u.company_id   AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS key_word_num,
+//			( SELECT 	COUNT(1 )  as count  FROM cygx_activity_signup AS h INNER JOIN cygx_activity as a ON a.activity_id = h.activity_id  INNER JOIN cygx_activity_type as t ON t.activity_type_id = a.activity_type_id  INNER JOIN wx_user as wu  ON wu.user_id = h.user_id  WHERE h.company_id = u.company_id
+//					  AND t.activity_type=1 AND h.do_fail_type = 0   AND h.create_time < date_format(now(),'%Y-%m-%d') ) AS on_line_num,
+//			( SELECT  	COUNT( 1 )  as count  FROM cygx_activity_signup AS h INNER JOIN cygx_activity as a ON a.activity_id = h.activity_id  INNER JOIN cygx_activity_type as t ON t.activity_type_id = a.activity_type_id  INNER JOIN wx_user as wu  ON wu.user_id = h.user_id WHERE h.company_id = u.company_id
+//					 AND t.activity_type = 0 AND h.do_fail_type = 0 AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS office_num
+//		FROM
+//			company  as u
+//		WHERE
+//			u.company_id = ?`
+//	err = o.Raw(sql, companyId).QueryRow(&item)
+//	return
+//}
 
 // 获取阅读记录数量
-func GetCygxArticleHistoryCountByCompany(condition string) (count int, err error) {
-	o := orm.NewOrm()
-	sqlCount := ` SELECT COUNT( 1 ) AS count 
-FROM
-	(
-	SELECT
-		COUNT( 1 ) 
-	FROM
-		cygx_article_history_record_all AS r
-		INNER JOIN cygx_article AS art ON art.article_id = r.article_id
-		INNER JOIN company_product AS cp ON cp.company_id = r.company_id 
-		AND cp.product_id = 2
-		INNER JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
-		INNER JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
-		LEFT  JOIN cygx_report_mapping AS re ON re.category_id = art.category_id_two   WHERE   r.is_del = 0`
-	if condition != "" {
-		sqlCount += condition
-	}
-	sqlCount += `	GROUP BY r.id ) AS count `
-	err = o.Raw(sqlCount).QueryRow(&count)
-	return
-}
+//func GetCygxArticleHistoryCountByCompany(condition string) (count int, err error) {
+//	o := orm.NewOrm()
+//	sqlCount := ` SELECT COUNT( 1 ) AS count
+//FROM
+//	(
+//	SELECT
+//		COUNT( 1 )
+//	FROM
+//		cygx_article_history_record_all AS r
+//		INNER JOIN cygx_article AS art ON art.article_id = r.article_id
+//		INNER JOIN company_product AS cp ON cp.company_id = r.company_id
+//		AND cp.product_id = 2
+//		INNER JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
+//		INNER JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
+//		LEFT  JOIN cygx_report_mapping AS re ON re.category_id = art.category_id_two   WHERE   r.is_del = 0`
+//	if condition != "" {
+//		sqlCount += condition
+//	}
+//	sqlCount += `	GROUP BY r.id ) AS count `
+//	err = o.Raw(sqlCount).QueryRow(&count)
+//	return
+//}
 
 // 阅读记录列表
 func GetCygxArticleHistoryRecordByCompany(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			art.title,
 			art.article_id,
@@ -86,14 +86,13 @@ func GetCygxArticleHistoryRecordByCompany(condition string, startSize, pageSize
 
 // 获取用户参会记录数量
 func GetActivityMeetByCompanyCount(condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `SELECT
 				COUNT(*) AS count 
 			FROM
 				cygx_activity_signup_detail AS r
 				INNER JOIN cygx_activity AS a ON a.activity_id = r.activity_id
 				INNER JOIN cygx_activity_type as t ON t.activity_type_id = a.activity_type_id
-				INNER JOIN wx_user AS u ON u.mobile = r.mobile 
 			WHERE
 				1 = 1 
 				AND r.do_fail_type = 0`
@@ -106,13 +105,13 @@ func GetActivityMeetByCompanyCount(condition string) (count int, err error) {
 
 // 获取用户参会记录
 func GetActivityMeetByCompany(condition string, startSize, pageSize int) (item []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			t.activity_type,
 			r.signup_type,
 			r.is_meeting,
-			u.mobile,
-			u.real_name,
+			r.mobile,
+			r.real_name,
 			a.activity_name,
 			a.chart_permission_name,
 			a.activity_type_name,
@@ -128,7 +127,6 @@ func GetActivityMeetByCompany(condition string, startSize, pageSize int) (item [
 			cygx_activity_signup_detail AS r
 			INNER  JOIN cygx_activity AS a ON a.activity_id = r.activity_id
 			INNER JOIN cygx_activity_type as t ON t.activity_type_id = a.activity_type_id
-			INNER JOIN wx_user as u  ON u.mobile = r.mobile
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 		WHERE
 			1 = 1 
@@ -148,16 +146,16 @@ func GetActivityMeetByCompany(condition string, startSize, pageSize int) (item [
 
 // 收藏列表数量
 func GetCygxArticleCollectCountByCompany(condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article_collect as r INNER JOIN cygx_article AS art ON art.article_id = r.article_id
-			INNER JOIN wx_user as u  ON u.user_id = r.user_id  WHERE   1=1 ` + condition
+		  WHERE   1=1 ` + condition
 	err = o.Raw(sqlCount).QueryRow(&count)
 	return
 }
 
 // 收藏列表
 func GetCygxArticleCollectByCompany(startSize, pageSize int, condition string) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			art.title,
 			art.article_id,
@@ -188,7 +186,6 @@ func GetCygxArticleCollectByCompany(startSize, pageSize int, condition string) (
 		FROM
 			cygx_article_collect AS r
 			INNER JOIN cygx_article AS art ON art.article_id = r.article_id
-			INNER JOIN wx_user as u  ON u.user_id = r.user_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			LEFT JOIN cygx_report_mapping AS re ON re.category_id = art.category_id_two
 			LEFT JOIN cygx_industrial_article_group_management AS man ON man.article_id = art.article_id 
@@ -204,27 +201,25 @@ func GetCygxArticleCollectByCompany(startSize, pageSize int, condition string) (
 
 // 关注产业数量
 func GetCygxIndustryFllowCountByCompany(condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industry_fllow AS r
-			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id 
-			INNER JOIN wx_user as u  ON u.user_id = r.user_id  WHERE   type = 1  ` + condition
+			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id WHERE   type = 1  ` + condition
 	err = o.Raw(sqlCount).QueryRow(&count)
 	return
 }
 
 // 关注产业列表
 func GetCygxIndustryFllowByCompany(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			m.industry_name,
-			u.mobile,
-			u.real_name,
+			r.mobile,
+			r.real_name,
 			r.modify_time as create_time,
 			( SELECT GROUP_CONCAT( DISTINCT s.subject_name SEPARATOR '/' ) FROM cygx_industrial_subject AS s WHERE s.industrial_management_id = m.industrial_management_id ) AS subject_name_str 
 		FROM
 			cygx_industry_fllow AS r
-			LEFT  JOIN wx_user as u  ON u.mobile = r.mobile
-			LEFT  JOIN cygx_user_interaction_num as ui  ON ui.user_id = u.user_id
+			LEFT  JOIN cygx_user_interaction_num as ui  ON ui.user_id = r.user_id
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id 
 		WHERE  type = 1 ` + condition + ` ORDER BY ui.industry_fllow_num DESC, r.create_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
@@ -233,17 +228,16 @@ func GetCygxIndustryFllowByCompany(condition string, startSize, pageSize int) (i
 
 // 关注作者数量
 func GetCygArticleDepartmentFollowCountByCompany(condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article_department_follow AS r
-			INNER JOIN cygx_article_department AS m ON m.department_id = r.department_id
-			INNER JOIN wx_user as u  ON u.user_id = r.user_id  WHERE    type = 1  ` + condition
+			INNER JOIN cygx_article_department AS m ON m.department_id = r.department_id WHERE    type = 1  ` + condition
 	err = o.Raw(sqlCount).QueryRow(&count)
 	return
 }
 
 // 关注作者列表
 func GetCygArticleDepartmentFollowByCompany(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			m.department_id,
 			m.nick_name,
@@ -261,7 +255,6 @@ func GetCygArticleDepartmentFollowByCompany(condition string, startSize, pageSiz
 			cygx_article_department_follow AS r
 			INNER JOIN cygx_article_department AS m ON m.department_id = r.department_id
 			INNER JOIN cygx_article AS a ON a.department_id = m.department_id
-			INNER JOIN wx_user as u  ON u.user_id = r.user_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
 			LEFT JOIN cygx_industrial_management AS i ON i.industrial_management_id = mg.industrial_management_id
@@ -273,7 +266,7 @@ func GetCygArticleDepartmentFollowByCompany(condition string, startSize, pageSiz
 
 // 用户搜索关键词统计
 func GetCygxSearchKeyWordCountBuCompany(condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_search_key_word  as r  WHERE  1= 1  ` + condition
 	err = o.Raw(sqlCount).QueryRow(&count)
 	return
@@ -281,7 +274,7 @@ func GetCygxSearchKeyWordCountBuCompany(condition string) (count int, err error)
 
 // 用户搜索关键词列表
 func GetCygxSearchKeyWordByCompany(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			r.key_word,
 			r.create_time,
@@ -298,7 +291,7 @@ func GetCygxSearchKeyWordByCompany(condition string, startSize, pageSize int) (i
 
 // 用户专项产业调研统计
 func GetCygxActivitySpecialTripCountByCompany(condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT
 			COUNT( 1 ) 
 		FROM
@@ -313,7 +306,7 @@ func GetCygxActivitySpecialTripCountByCompany(condition string) (count int, err
 
 // 用户专项产业调研列表
 func CygxActivitySpecialTripByCompany(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.research_theme AS activity_name,
 			a.chart_permission_name,
@@ -336,7 +329,7 @@ func CygxActivitySpecialTripByCompany(condition string, startSize, pageSize int)
 
 // 用户音视频浏览统计
 func GetCygxRoadshowCountByCompany(condition string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `SELECT
 	COUNT( 1 ) total 
 FROM
@@ -365,7 +358,7 @@ FROM
 
 // 用户音视频浏览列表
 func GetCygxRoadshowByCompany(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			v.video_name AS media_title,
 			r.create_time,
@@ -409,7 +402,7 @@ func GetCygxRoadshowByCompany(condition string, startSize, pageSize int) (items
 
 // 用户音视频浏览列表
 func GetCygxRoadshowByCompanyList(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			v.video_name AS media_title,
 			r.create_time,
@@ -423,7 +416,6 @@ func GetCygxRoadshowByCompanyList(condition string, startSize, pageSize int) (it
 		FROM
 			cygx_micro_roadshow_video_history AS r
 			INNER JOIN cygx_micro_roadshow_video AS v ON r.video_id = v.video_id
-			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id 
 		WHERE 1=1 ` + condition + `  UNION ALL
@@ -440,7 +432,6 @@ func GetCygxRoadshowByCompanyList(condition string, startSize, pageSize int) (it
 		FROM
 			cygx_activity_video_history AS r
 			INNER JOIN cygx_activity_video AS v ON r.video_id = v.video_id
-			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id 
 		WHERE 1=1 ` + condition + `   UNION ALL
@@ -457,7 +448,6 @@ func GetCygxRoadshowByCompanyList(condition string, startSize, pageSize int) (it
 		FROM
 			cygx_activity_voice_history AS r
 			INNER JOIN cygx_activity_voice AS v ON r.activity_id = v.activity_id
-			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id 
 		WHERE 1=1 ` + condition + `  
@@ -468,6 +458,7 @@ func GetCygxRoadshowByCompanyList(condition string, startSize, pageSize int) (it
 
 // 根据时间获取机构互动总数统计
 func GetCompanyInteractionTableCountBytime(companyId int, startDate, endDate string) (item *GetUserInteractionTableCountResp, err error) {
+	return
 	o := orm.NewOrm()
 	sql := `SELECT
 			( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h  INNER JOIN cygx_article  as art  ON  art.article_id = h.article_id  WHERE h.company_id = u.company_id AND h.is_del = 0  	AND create_time BETWEEN '` + startDate + `'AND '` + endDate + `'   AND h.create_time < date_format(now(),'%Y-%m-%d')  ) AS history_num,
@@ -490,7 +481,7 @@ func GetCompanyInteractionTableCountBytime(companyId int, startDate, endDate str
 
 // 机构阅读记录列表
 func GetCygxArticleHistoryRecordByCompanyList(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			art.title,
 			art.article_id,
@@ -511,7 +502,6 @@ func GetCygxArticleHistoryRecordByCompanyList(condition string, startSize, pageS
 		FROM
 			cygx_article_history_record_all AS r
 			INNER JOIN cygx_article AS art ON art.article_id = r.article_id
-			INNER JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
 			INNER JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			INNER JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			LEFT  JOIN cygx_report_mapping AS re ON re.category_id = art.category_id_two 
@@ -526,13 +516,13 @@ func GetCygxArticleHistoryRecordByCompanyList(condition string, startSize, pageS
 
 // 获取机构参会记录
 func GetActivityMeetByCompanyList(condition string, startSize, pageSize int) (item []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			t.activity_type,
 			r.signup_type,
 			r.is_meeting,
-			u.mobile,
-			u.real_name,
+			r.mobile,
+			r.real_name,
 			a.activity_name,
 			a.chart_permission_name,
 			a.activity_type_name,
@@ -551,8 +541,6 @@ func GetActivityMeetByCompanyList(condition string, startSize, pageSize int) (it
 			cygx_activity_signup_detail AS r
 			INNER  JOIN cygx_activity AS a ON a.activity_id = r.activity_id
 			INNER JOIN cygx_activity_type as t ON t.activity_type_id = a.activity_type_id
-			INNER JOIN wx_user as u  ON u.mobile = r.mobile
-			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 		WHERE
@@ -574,7 +562,7 @@ func GetActivityMeetByCompanyList(condition string, startSize, pageSize int) (it
 
 // 机构收藏列表
 func GetCygxArticleCollectByCompanyList(startSize, pageSize int, condition string) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			art.title,
 			art.article_id,
@@ -607,8 +595,6 @@ func GetCygxArticleCollectByCompanyList(startSize, pageSize int, condition strin
 		FROM
 			cygx_article_collect AS r
 			INNER JOIN cygx_article AS art ON art.article_id = r.article_id
-			INNER JOIN wx_user as u  ON u.user_id = r.user_id
-			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			LEFT JOIN cygx_report_mapping AS re ON re.category_id = art.category_id_two
@@ -625,20 +611,18 @@ func GetCygxArticleCollectByCompanyList(startSize, pageSize int, condition strin
 
 // 关注产业列表
 func GetCygxIndustryFllowByCompanyList(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			m.industry_name,
-			u.mobile,
-			u.real_name,
+			r.mobile,
+			r.real_name,
 			r.modify_time as create_time,
 			cp.company_name,
 			cp.seller_name,
 			( SELECT GROUP_CONCAT( DISTINCT s.subject_name SEPARATOR '/' ) FROM cygx_industrial_subject AS s WHERE s.industrial_management_id = m.industrial_management_id ) AS subject_name_str 
 		FROM
 			cygx_industry_fllow AS r
-			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id 
-			INNER JOIN wx_user as u  ON u.user_id = r.user_id
-			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
+			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT  JOIN cygx_user_interaction_num as ui  ON ui.user_id = u.user_id
 			
@@ -649,7 +633,7 @@ func GetCygxIndustryFllowByCompanyList(condition string, startSize, pageSize int
 
 // 关注作者机构列表
 func GetCygArticleDepartmentFollowByCompanyList(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			m.department_id,
 			m.nick_name,
@@ -669,9 +653,7 @@ func GetCygArticleDepartmentFollowByCompanyList(condition string, startSize, pag
 			cygx_article_department_follow AS r
 			INNER JOIN cygx_article_department AS m ON m.department_id = r.department_id
 			INNER JOIN cygx_article AS a ON a.department_id = m.department_id
-			INNER JOIN wx_user as u  ON u.user_id = r.user_id 
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
-			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
 			LEFT JOIN cygx_industrial_management AS i ON i.industrial_management_id = mg.industrial_management_id
@@ -683,17 +665,15 @@ func GetCygArticleDepartmentFollowByCompanyList(condition string, startSize, pag
 
 // 用户搜索关键词列表
 func GetCygxSearchKeyWordByCompanyList(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			r.key_word,r.create_time,
 			r.mobile,
 			r.source,
-			cp.company_name,
-			cp.seller_name,
+			r.company_name,
 			r.real_name
 		FROM
 			cygx_search_key_word as r
-			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			WHERE 1= 1 ` + condition + `
@@ -704,7 +684,7 @@ func GetCygxSearchKeyWordByCompanyList(condition string, startSize, pageSize int
 
 // 用户搜索关键词列表
 func GetCygxActivitySpecialTripByCompanyList(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.research_theme AS activity_name,
 			a.chart_permission_name,
@@ -715,13 +695,12 @@ func GetCygxActivitySpecialTripByCompanyList(condition string, startSize, pageSi
 			r.real_name,
 			r.is_meeting,
 			r.activity_id,
-			cp.company_name,
-			cp.seller_name,
+			r.company_name,
+			r.seller_name,
 			r.real_name
 		FROM
 			cygx_activity_special_trip as r
 			INNER JOIN cygx_activity_special AS a ON a.activity_id = r.activity_id
-			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			WHERE 1= 1 ` + condition + `
@@ -732,7 +711,7 @@ func GetCygxActivitySpecialTripByCompanyList(condition string, startSize, pageSi
 
 // 通过纪要ID获取活动详情
 func GetTableCompanyList() (item *GetUserInteractionTableCountResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 	SUM( article_history_num ) AS history_num,
 	SUM( article_count_num ) AS count_num,
@@ -750,6 +729,7 @@ FROM
 
 // 获取用户参会记录根据销售分组
 func GetActivityMeetBySeller(condition string) (list []*company.CompanyReportRecordGroup, err error) {
+	return
 	o := orm.NewOrm()
 	sqlCount := `				SELECT
 				p.seller_id as admin_id,count(DISTINCT(r.company_id)) num,GROUP_CONCAT(DISTINCT r.company_id SEPARATOR ',') AS company_ids
@@ -774,6 +754,7 @@ func GetActivityMeetBySeller(condition string) (list []*company.CompanyReportRec
 
 // 收藏列表数量根据销售分组
 func GetCygxArticleCollectCountBySeller(condition string) (list []*company.CompanyReportRecordGroup, err error) {
+	return // 没有使用了
 	o := orm.NewOrm()
 	sqlCount := ` SELECT
 	p.seller_id as admin_id,count(DISTINCT(r.company_id)) num,GROUP_CONCAT(DISTINCT r.company_id SEPARATOR ',') AS company_ids
@@ -816,6 +797,7 @@ WHERE
 
 // 关注作者数量根据销售分组
 func GetCygArticleDepartmentFollowCountBySeller(condition string) (list []*company.CompanyReportRecordGroup, err error) {
+	return // 没有使用了
 	o := orm.NewOrm()
 	sqlCount := ` SELECT
 	p.seller_id AS admin_id,
@@ -862,14 +844,13 @@ type CompanyAndCount struct {
 
 // 获取用户参会记录数量根据公司分组
 func GetActivityMeetGroupByCompany(condition string) (list []*CompanyAndCount, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `	SELECT
 	r.company_id,COUNT(*) AS count  
 FROM
 	cygx_activity_signup AS r
 	INNER JOIN cygx_activity AS a ON a.activity_id = r.activity_id
 	INNER JOIN cygx_activity_type AS t ON t.activity_type_id = a.activity_type_id
-	INNER JOIN wx_user AS u ON u.user_id = r.user_id 
 WHERE
 	1 = 1 
 	AND r.do_fail_type = 0 `
@@ -883,14 +864,13 @@ WHERE
 
 // 收藏列表数量根据公司分组
 func GetCygxArticleCollectCountGroupByCompany(condition string) (list []*CompanyAndCount, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `	SELECT
 	r.company_id,
 	COUNT(*) AS count 
 FROM
 	cygx_article_collect AS r
 	INNER JOIN cygx_article AS art ON art.article_id = r.article_id
-	INNER JOIN wx_user AS u ON u.user_id = r.user_id 
 WHERE
 	1 = 1 `
 	if condition != "" {
@@ -903,14 +883,13 @@ WHERE
 
 // 关注产业数量根据公司分组
 func GetCygxIndustryFllowCountGroupByCompany(condition string) (list []*CompanyAndCount, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `		SELECT
 	r.company_id,
 	COUNT(*) AS count 
 FROM
 	cygx_industry_fllow AS r
 	INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id
-	INNER JOIN wx_user AS u ON u.user_id = r.user_id 
 WHERE
 	type = 1 `
 	if condition != "" {
@@ -923,14 +902,13 @@ WHERE
 
 // 关注作者数量根据公司分组
 func GetCygArticleDepartmentFollowCountGroupByCompany(condition string) (list []*CompanyAndCount, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `	SELECT
 	r.company_id,
 	COUNT(*) AS count 
 FROM
 	cygx_article_department_follow AS r
 	INNER JOIN cygx_article_department AS m ON m.department_id = r.department_id
-	INNER JOIN wx_user AS u ON u.user_id = r.user_id 
 WHERE
 	type = 1 `
 	if condition != "" {
@@ -943,7 +921,7 @@ WHERE
 
 // 用户搜索关键词统计
 func GetCygxSearchKeyWordCountGroupByCompany(condition string) (list []*CompanyAndCount, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT
 	r.company_id,
 	COUNT(*) AS count 
@@ -960,7 +938,7 @@ WHERE
 }
 
 func GetChartCountGroupByCompany(condition string) (list []*CompanyAndCount, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT
 	r.company_id,
 	COUNT(*) AS count 
@@ -996,7 +974,7 @@ func GetCompanyCountGroupBySeller(condition string) (list []*company.CompanyRepo
 
 // 获取文章阅读记录根据公司分组
 func GetArticleHistoryGroupByCompany(condition string) (list []*CompanyAndCount, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := `	SELECT
 	r.company_id,COUNT(*) AS count  
 FROM

models/cygx/cygx_user_record.go

@@ -2,6 +2,7 @@ package cygx
 
 import (
 	"github.com/beego/beego/v2/client/orm"
+	"hongze/hz_crm_api/utils"
 	"time"
 )
 
@@ -24,39 +25,65 @@ type OpenIdList struct {
 	CompanyId int `description:"公司ID"`
 }
 
+type OpenIdMobileList struct {
+	OpenId string
+	UserId int
+	Mobile string `description:"手机号"`
+}
+
 func GetCygxUserRecord() (items []*CygxUserRecord, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT union_id,open_id FROM cygx_user_record  `
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
+	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 // 获取所有有权限的用户的opid
 func GetCygxUserRecordPower(chartPermissionIds string) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			cr.open_id,
-			u.user_id,
-			u.company_id,
-			u.real_name,
-			u.mobile 
-		FROM
-			company_report_permission AS p
-			INNER JOIN wx_user AS u ON u.company_id = p.company_id
-			INNER JOIN user_record AS r ON r.user_id = u.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id 
-		WHERE
-			p.chart_permission_id IN (` + chartPermissionIds + `)
-			AND r.create_platform = 4 
-			AND p.STATUS IN ('正式','试用','永续')   GROUP BY cr.open_id `
-	_, err = o.Raw(sql).QueryRows(&items)
+	//o := orm.NewOrm()
+	//sql := `SELECT
+	//		cr.open_id,
+	//		u.user_id,
+	//		u.company_id,
+	//		u.real_name,
+	//		u.mobile
+	//	FROM
+	//		company_report_permission AS p
+	//		INNER JOIN wx_user AS u ON u.company_id = p.company_id
+	//		INNER JOIN user_record AS r ON r.user_id = u.user_id
+	//		INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id
+	//	WHERE
+	//		p.chart_permission_id IN (` + chartPermissionIds + `)
+	//		AND r.create_platform = 4
+	//		AND p.STATUS IN ('正式','试用','永续')   GROUP BY cr.open_id `
+	//_, err = o.Raw(sql).QueryRows(&items)
+
+	listMobile, err := GetCygxUserRecordPowerMobileList(chartPermissionIds)
+	if err != nil {
+		return
+	}
+	var mobileArr []string
+	for _, v := range listMobile {
+		if v.Mobile != "" {
+			mobileArr = append(mobileArr, v.Mobile)
+		}
+	}
+	mobileLen := len(mobileArr)
+	if mobileLen == 0 {
+		return
+	}
+	openIdList, err := GetUserRecordListByMobileArr(mobileArr)
+	if err != nil {
+		return
+	}
+	items = openIdList
 	return
 }
 
 // 获取所有有权限的用户的opid
-func GetCygxUserRecordPowerOpenid(condition string, pars []interface{}) (items []*OpenIdList, err error) {
+func GetCygxUserRecordPowerMobileList(chartPermissionIds string) (items []*OpenIdMobileList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			cr.open_id,
 			u.user_id,
 			u.company_id,
 			u.real_name,
@@ -65,28 +92,26 @@ func GetCygxUserRecordPowerOpenid(condition string, pars []interface{}) (items [
 			company_report_permission AS p
 			INNER JOIN wx_user AS u ON u.company_id = p.company_id
 			INNER JOIN user_record AS r ON r.user_id = u.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id 
 		WHERE
- 			1 =1
-			AND r.create_platform = 4  ` + condition + ` GROUP BY cr.open_id `
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+			p.chart_permission_id IN (` + chartPermissionIds + `)
+			AND r.create_platform = 4 
+			AND p.STATUS IN ('正式','试用','永续')   GROUP BY u.user_id `
+	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 // 获取关注这个文章对应产业的用户的 openid
 func GetCygxUserFllowOpenid(articleId int) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			cr.open_id,
-			f.user_id 
+			cr.cygx_user_id  as user_id 
 		FROM
 			cygx_xzs_choose_send AS s
 			INNER JOIN cygx_industry_fllow AS f ON f.user_id = s.user_id
-			INNER JOIN user_record AS r ON r.user_id = f.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id 
+			INNER JOIN cygx_user_record AS cr ON cr.cygx_user_id = s.user_id 
 			INNER JOIN cygx_industrial_article_group_management as mg  ON mg.industrial_management_id = f.industrial_management_id
-		WHERE
-			r.create_platform = 4 
+		WHERE 1=1 
 			AND mg.article_id  = ?`
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return
@@ -94,17 +119,16 @@ func GetCygxUserFllowOpenid(articleId int) (items []*OpenIdList, err error) {
 
 // 获取关注这个产业的用户的 openid
 func GetCygxUserindustryFllowOpenid(industrialId int) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			cr.open_id,
-			f.user_id 
+			cr.cygx_user_id  as user_id 
 		FROM
 			cygx_xzs_choose_send AS s
 			INNER JOIN cygx_industry_fllow AS f ON f.user_id = s.user_id
-			INNER JOIN user_record AS r ON r.user_id = f.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id
+			INNER JOIN cygx_user_record AS cr ON cr.cygx_user_id = s.user_id 
 		WHERE
-			r.create_platform = 4 
+			 1=1  
 			AND f.industrial_management_id  = ?`
 	_, err = o.Raw(sql, industrialId).QueryRows(&items)
 	return
@@ -112,17 +136,16 @@ func GetCygxUserindustryFllowOpenid(industrialId int) (items []*OpenIdList, err
 
 // 获取关注这个文章对应作者的用户的 openid
 func GetCygxUserFllowDepartmentOpenid(articleId int) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			cr.open_id,
-			f.user_id 
+			cr.cygx_user_id  as user_id 
 		FROM
 			cygx_article_department_follow AS f
-			INNER JOIN user_record AS r ON r.user_id = f.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id
+			INNER JOIN cygx_user_record AS cr ON cr.cygx_user_id = f.user_id 
 			INNER JOIN cygx_article AS a ON a.department_id = f.department_id 
 		WHERE
-			r.create_platform = 4 
+			 1=1   
 			AND a.article_id = ?`
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return
@@ -130,16 +153,15 @@ func GetCygxUserFllowDepartmentOpenid(articleId int) (items []*OpenIdList, err e
 
 // 获取拒绝接收推送的的用户的 openid
 func GetCygxUserRefusetOpenid() (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			cr.open_id,
-			s.user_id
+			cr.cygx_user_id  as user_id 
 			FROM
 			cygx_xzs_choose_send AS s
-			INNER JOIN user_record AS r ON r.user_id = s.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id
+			INNER JOIN cygx_user_record AS cr ON cr.cygx_user_id = s.user_id 
 			WHERE
-			r.create_platform = 4
+			1=1
 			AND s.is_refuse = 1`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -150,17 +172,16 @@ func GetCygxUserFllowCeLueOpenid(categoryId int) (items []*OpenIdList, err error
 	o := orm.NewOrm()
 	sql := `SELECT
 			cr.open_id,
-			f.user_id 
+			cr.cygx_user_id AS user_id 
 		FROM
 			cygx_xzs_choose_send AS s
 			INNER JOIN cygx_xzs_choose_category AS f ON f.user_id = s.user_id
-			INNER JOIN user_record AS r ON r.user_id = f.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id 
+			INNER JOIN cygx_user_record AS cr ON cr.cygx_user_id = s.user_id 
 		WHERE
-			r.create_platform = 4
-			AND s.is_refuse = 0
-			AND s.is_subjective = 1
-			AND s.is_objective = 1
+			1 = 1 
+			AND s.is_refuse = 0 
+			AND s.is_subjective = 1 
+			AND s.is_objective = 1 
 			AND f.category_id = ?`
 	_, err = o.Raw(sql, categoryId).QueryRows(&items)
 	return
@@ -170,50 +191,90 @@ func GetCygxUserFllowCeLueOpenid(categoryId int) (items []*OpenIdList, err error
 func GetCygxActiviyUserFllowOpenid(activityId int) (items []*OpenIdList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			cr.open_id,
-			f.user_id 
+				cr.open_id,
+				cr.cygx_user_id AS user_id  
 		FROM
 			cygx_xzs_choose_send AS s
 			INNER JOIN cygx_industry_fllow AS f ON f.user_id = s.user_id
-			INNER JOIN user_record AS r ON r.user_id = f.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id
+			INNER JOIN cygx_user_record AS cr  ON cr.cygx_user_id = s.user_id 
 			INNER JOIN cygx_industrial_activity_group_management AS mg ON mg.industrial_management_id = f.industrial_management_id 
 		WHERE
-			r.create_platform = 4 
+			1=1 
 			AND mg.activity_id = ?`
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }
 
-// 根据销售规模，获取所有有权限的用户的opid
-func GetCygxUserRecordPowerByScale(chartPermissionIds, scale string) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			cr.open_id,
-			u.user_id,
-			u.company_id,
-			u.real_name,
-			u.mobile 
-		FROM
-			company_report_permission AS p
-			INNER JOIN wx_user AS u ON u.company_id = p.company_id
-			INNER JOIN user_record AS r ON r.user_id = u.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id 
-			INNER JOIN company_product AS cp ON cp.company_id = p.company_id
-		WHERE
-			p.chart_permission_id IN (` + chartPermissionIds + `)
-			AND cp.scale IN (` + scale + `)
-			AND r.create_platform = 4 
-			AND p.STATUS IN ('正式','试用','永续')   GROUP BY  u.company_id `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
+//// 根据销售规模，获取所有有权限的用户的opid
+//func GetCygxUserRecordPowerByScale(chartPermissionIds, scale string) (items []*OpenIdList, err error) {
+//	o := orm.NewOrm()
+//	sql := `SELECT
+//			cr.open_id,
+//			u.user_id,
+//			u.company_id,
+//			u.real_name,
+//			u.mobile
+//		FROM
+//			company_report_permission AS p
+//			INNER JOIN wx_user AS u ON u.company_id = p.company_id
+//			INNER JOIN user_record AS r ON r.user_id = u.user_id
+//			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id
+//			INNER JOIN company_product AS cp ON cp.company_id = p.company_id
+//		WHERE
+//			p.chart_permission_id IN (` + chartPermissionIds + `)
+//			AND cp.scale IN (` + scale + `)
+//			AND r.create_platform = 4
+//			AND p.STATUS IN ('正式','试用','永续')   GROUP BY  u.company_id `
+//	_, err = o.Raw(sql).QueryRows(&items)
+//	return
+//}
 
 // GetCygxUserRecordPowerByActivitySet 根据活动设置，获取所有有权限的用户的opid
 func GetCygxUserRecordPowerByActivitySet(chartPermissionIds, condition string) (items []*OpenIdList, err error) {
+	//o := orm.NewOrm()
+	//sql := `SELECT
+	//		cr.open_id,
+	//		u.user_id,
+	//		u.company_id,
+	//		u.real_name,
+	//		u.mobile
+	//	FROM
+	//		company_report_permission AS p
+	//		INNER JOIN wx_user AS u ON u.company_id = p.company_id
+	//		INNER JOIN user_record AS r ON r.user_id = u.user_id
+	//		INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id
+	//	WHERE
+	//		p.chart_permission_id IN (` + chartPermissionIds + `) ` + condition + ` AND r.create_platform = 4
+	//		AND p.STATUS IN ('正式','试用','永续')   GROUP BY cr.open_id `
+	//_, err = o.Raw(sql).QueryRows(&items)
+
+	listMobile, err := GetCygxUserRecordPowerByActivitySetListMobile(chartPermissionIds, condition)
+	if err != nil {
+		return
+	}
+	var mobileArr []string
+	for _, v := range listMobile {
+		if v.Mobile != "" {
+			mobileArr = append(mobileArr, v.Mobile)
+		}
+	}
+	mobileLen := len(mobileArr)
+	if mobileLen == 0 {
+		return
+	}
+	openIdList, err := GetUserRecordListByMobileArr(mobileArr)
+	if err != nil {
+		return
+	}
+	items = openIdList
+
+	return
+}
+
+// GetCygxUserRecordPowerByActivitySetListMobile 根据活动设置，获取所有有权限的用户的手机号
+func GetCygxUserRecordPowerByActivitySetListMobile(chartPermissionIds, condition string) (items []*OpenIdMobileList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			cr.open_id,
 			u.user_id,
 			u.company_id,
 			u.real_name,
@@ -222,29 +283,56 @@ func GetCygxUserRecordPowerByActivitySet(chartPermissionIds, condition string) (
 			company_report_permission AS p
 			INNER JOIN wx_user AS u ON u.company_id = p.company_id
 			INNER JOIN user_record AS r ON r.user_id = u.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id 
 		WHERE
-			p.chart_permission_id IN (` + chartPermissionIds + `) ` + condition + ` AND r.create_platform = 4 
-			AND p.STATUS IN ('正式','试用','永续')   GROUP BY cr.open_id `
+			p.chart_permission_id IN (` + chartPermissionIds + `) ` + condition + ` 
+			AND p.STATUS IN ('正式','试用','永续')   GROUP BY u.user_id `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 // 获取关注了查研观向小助手公众号的所有公司ID
 func GetCygxUserRecordCompany() (items []*OpenIdList, err error) {
+	listUser, err := GetCygxUserRecordCompanyUserId()
+	if err != nil {
+		return
+	}
+	var userIds []int
+	for _, v := range listUser {
+		userIds = append(userIds, v.UserId)
+	}
+	lenarr := len(userIds)
+	if lenarr == 0 {
+		return
+	}
+
+	var condition string
+	var pars []interface{}
+	condition = ` AND w.user_id  IN (` + utils.GetOrmInReplace(lenarr) + `)`
+	pars = append(pars, userIds)
+
 	o := orm.NewOrm()
 	sql := `SELECT
 			w.company_id 
 		FROM
-			cygx_user_record AS u
-			INNER JOIN user_record AS r ON r.union_id = u.union_id
-			INNER JOIN wx_user AS w ON w.user_id = r.user_id 
+			wx_user AS w
+		WHERE
+			1 = 1` + condition + `GROUP BY	 w.company_id `
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
+// 获取关注了查研观向小助手公众号的所有用户ID
+func GetCygxUserRecordCompanyUserId() (items []*OpenIdList, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT
+			u.cygx_user_id AS user_id 
+		FROM
+			cygx_user_record AS u 
 		WHERE
 			1 = 1 
-			AND r.create_platform = 4 
-			AND w.company_id != 1 
+			AND subscribe = 1 
 		GROUP BY
-			w.company_id `
+			u.cygx_user_id `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -276,3 +364,25 @@ func GetCompanyReportPermissionItem(condition string, pars []interface{}) (items
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// 根据手机号获取用户的openid
+func GetUserRecordListByMobileArr(bindAccount []string) (items []*OpenIdList, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	lenarr := len(bindAccount)
+	if lenarr == 0 {
+		return
+	}
+	var condition string
+	var pars []interface{}
+	condition = ` AND u.cygx_bind_account IN (` + utils.GetOrmInReplace(lenarr) + `)`
+	pars = append(pars, bindAccount)
+	sql := `SELECT
+			u.open_id,
+			u.cygx_user_id AS user_id 
+		FROM
+			cygx_user_record AS u 
+		WHERE
+			1 = 1  ` + condition
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}

models/cygx/industrial_activity_group_management.go

@@ -28,16 +28,14 @@ type IndustryAndSubjectName struct {
 
 // 列表
 func GetIndustrialActivityGroupManagementList(activityId, source int) (items []*IndustrialActivityGroupManagementRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	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 = ?`
 	_, err = o.Raw(sql, activityId, source).QueryRows(&items)
@@ -55,7 +53,7 @@ func GetIndustrialManagementGroupActCount(industrialManagementId int) (count int
 				WHERE
 				am.industrial_management_id =? 
 				AND a.publish_status = 1 `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, industrialManagementId).QueryRow(&count)
 	return
 }
@@ -65,7 +63,7 @@ func GetActivityIdsByIndustrialManagementId(industrialManagementId string) (acti
 			GROUP_CONCAT( DISTINCT activity_id ORDER BY id ASC SEPARATOR ',' ) AS activityId 
 			FROM
 			cygx_industrial_activity_group_management WHERE industrial_management_id IN (` + industrialManagementId + `)`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql).QueryRow(&activityId)
 	return
 }
@@ -78,7 +76,7 @@ type IndustrialActivityGroupResp struct {
 
 // 列表
 func GetIndustrialActivityGroupListByactivityIds(activityIds string) (items []*IndustrialActivityGroupResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT  mg.*,m.industry_name  FROM
 	        cygx_industrial_activity_group_management AS mg
 	      	 INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
@@ -111,7 +109,7 @@ func GetIndustryActCountGroupByType(industryId int) (list []*IndustryActCountGro
 					am.industrial_management_id = ? AND a.publish_status = 1
 				GROUP BY
 					activity_type `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sqlCount, industryId).QueryRows(&list)
 	return
 }
@@ -122,13 +120,14 @@ func GetCygxIndustrialActivityGroupManagementCount(condition string, pars []inte
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // CygxIndustrialActivityGroupManagement 获取活动与产业关联列表
 func GetCygxIndustrialActivityGroupManagementList(condition string, pars []interface{}) (list []*CygxIndustrialActivityGroupManagement, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			*
 			FROM
@@ -138,6 +137,6 @@ func GetCygxIndustrialActivityGroupManagementList(condition string, pars []inter
 	if condition != `` {
 		sql += condition
 	}
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&list)
+	_, err = o.Raw(sql, pars).QueryRows(&list)
 	return
 }

models/cygx/industrial_activity_group_subject.go

@@ -18,9 +18,9 @@ type SubjectActivityGroupManagementRep struct {
 	SubjectName         string `description:"标的名称"`
 }
 
-//列表
+// 列表
 func GetSubjectActivityGroupManagementList(activityId, source int) (items []*SubjectActivityGroupManagementRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			s.subject_name,
 			s.industrial_subject_id 
@@ -38,7 +38,7 @@ func GetActivityIdsByIndustrialSubjectId(industrialSubjectId string) (activityId
 			GROUP_CONCAT( DISTINCT activity_id ORDER BY id ASC SEPARATOR ',' ) AS activity_id 
 			FROM
 			cygx_industrial_activity_group_subject WHERE industrial_subject_id IN (` + industrialSubjectId + `)`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql).QueryRow(&activityId)
 	return
 }
@@ -50,9 +50,9 @@ type SubjectlActivityGroupResp struct {
 	SubjectName            string `description:"标的名称"`
 }
 
-//列表
+// 列表
 func GetSubjectActivityGroupListByactivityIds(activityIds string) (items []*SubjectlActivityGroupResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			sg.*,
 			s.subject_name,
@@ -67,7 +67,6 @@ func GetSubjectActivityGroupListByactivityIds(activityIds string) (items []*Subj
 	return
 }
 
-
 type IndustrySubjectActCountGroupByType struct {
 	ActivityType  string `json:"activity_type" description:"活动类型名称"`
 	ActivityCount int    `json:"activity_count" description:"关联的活动数"`
@@ -91,7 +90,7 @@ func GetIndustrySubjectActCountGroupByType(subjectId int) (list []*IndustrySubje
 					gsub.industrial_subject_id = ? AND a.publish_status = 1
 				GROUP BY
 					activity_type`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sqlCount, subjectId).QueryRows(&list)
 	return
-}
+}

models/cygx/industrial_analyst.go

@@ -1,7 +1,6 @@
 package cygx
 
 import (
-	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
@@ -25,44 +24,43 @@ type GetIndustrialAnalystList struct {
 	List []*CygxIndustrialAnalyst
 }
 
-//新增
+// 新增
 func AddIndustrialAnalyst(item *CygxIndustrialAnalyst) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Insert(item)
 	return
 }
 
-//列表
+// 列表
 func GetIndustrialAnalystAll(IndustrialManagementId int) (items []*CygxIndustrialAnalyst, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_analyst where industrial_management_id = ? `
 	_, err = o.Raw(sql, IndustrialManagementId).QueryRows(&items)
 	return
 }
 
-//获取数量
+// 获取数量
 func GetIndustrialAnalystCount(condition string, pars []interface{}) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industrial_analyst WHERE 1=1 `
 	if condition != "" {
 		sqlCount += condition
 	}
-	fmt.Println(sqlCount)
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
-//修改
+// 修改
 func EditIndustrialAnalyst(item *CygxIndustrialAnalyst) (err error) {
 	sql := `UPDATE cygx_industrial_analyst SET  analyst_name=? WHERE industrial_analyst_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, item.AnalystName, item.IndustrialAnalystId).Exec()
 	return
 }
 
-//删除数据
+// 删除数据
 func DeleteIndustrialAnalyst(industrialAnalystId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_industrial_analyst WHERE industrial_analyst_id = ?`
 	_, err = o.Raw(sql, industrialAnalystId).Exec()
 	return

models/cygx/industrial_article_group_management.go

@@ -16,7 +16,7 @@ type CygxIndustrialArticleGroupManagement struct {
 
 // 新增
 func AddCygxIndustrialArticleGroupManagement(item *CygxIndustrialArticleGroupManagement) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	if err != nil {
 		return
@@ -26,16 +26,14 @@ func AddCygxIndustrialArticleGroupManagement(item *CygxIndustrialArticleGroupMan
 
 // 列表
 func GetIndustrialArticleGroupManagementList(articleId int) (items []*IndustrialActivityGroupManagementRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	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)
@@ -44,7 +42,7 @@ func GetIndustrialArticleGroupManagementList(articleId int) (items []*Industrial
 
 // 通过名称获取详情
 func GetIndustrialManagemenDetailByAaticle(articleId int) (item *CygxIndustrialArticleGroupManagement, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_article_group_management WHERE article_id = ? `
 	err = o.Raw(sql, articleId).QueryRow(&item)
 	return
@@ -55,7 +53,7 @@ func GetArticleIdsByIndustrialManagementId(industrialManagementId string) (artic
 			GROUP_CONCAT( DISTINCT article_id ORDER BY id ASC SEPARATOR ',' ) AS articleId 
 			FROM
 			cygx_industrial_article_group_management WHERE industrial_management_id IN (` + industrialManagementId + `)`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql).QueryRow(&articleId)
 	return
 }
@@ -69,7 +67,7 @@ type ArticleIndustrialSubjectNameResp struct {
 
 // 通过文章ID获取所关联的产业与标的
 func GetCygxArticleIndustrialSubjectName(articleIds string) (items []*ArticleIndustrialSubjectNameResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			art.article_id,
 			(
@@ -104,7 +102,7 @@ type IndustrialArticleGroupResp struct {
 
 // 通过id 获取详情
 func GetIndustrialManagemenDetailByAaticleID(articleId int) (items []*ArticleIndustrialSubjectNameResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			article_id,
 			m.industrial_management_id,
@@ -120,7 +118,7 @@ func GetIndustrialManagemenDetailByAaticleID(articleId int) (items []*ArticleInd
 
 // 列表
 func GetIndustrialArticleGroupListByarticleIds(articleIds string) (items []*IndustrialArticleGroupResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT  mg.*,m.industry_name  FROM
 	        cygx_industrial_article_group_management AS mg
 	      	 INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
@@ -149,7 +147,7 @@ type IndustrialManagementHotResp struct {
 
 // 产业与文章关联列表
 func GetSearchResourceList(userId int, condition string, startSize, pageSize int) (items []*IndustrialManagementHotResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			m.industry_name,
 			m.industrial_management_id,

models/cygx/industrial_article_group_subject.go

@@ -15,7 +15,7 @@ type CygxIndustrialArticleGroupSubject struct {
 
 // 新增
 func AddCygxIndustrialArticleGroupSubject(item *CygxIndustrialArticleGroupSubject) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	if err != nil {
 		return
@@ -28,7 +28,7 @@ func GetSubjectIds(articleId int) (subjects string, err error) {
 			GROUP_CONCAT( DISTINCT industrial_subject_id ORDER BY id ASC SEPARATOR ',' ) AS subjects 
 			FROM
 			cygx_industrial_article_group_subject WHERE article_id = ?`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql, articleId).QueryRow(&subjects)
 	return
 }
@@ -38,14 +38,14 @@ func GetArticleIdsBySubjectId(industrialSubjectId string) (articleId string, err
 			GROUP_CONCAT( DISTINCT article_id ORDER BY id ASC SEPARATOR ',' ) AS articleId 
 			FROM
 			cygx_industrial_article_group_subject WHERE industrial_subject_id IN (` + industrialSubjectId + `)`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql).QueryRow(&articleId)
 	return
 }
 
 // 列表
 func GetSubjectArticleGroupManagementList(articleId int) (items []*SubjectActivityGroupManagementRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			s.subject_name,
 			s.industrial_subject_id 
@@ -67,7 +67,7 @@ type SubjectlArticleGroupResp struct {
 
 // 列表
 func GetSubjectArticleGroupListByarticleIds(articleIds string) (items []*SubjectlArticleGroupResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			sg.*,
 			s.subject_name,

models/cygx/industrial_management.go

@@ -108,14 +108,14 @@ type GetCygxIndustrialManagementList struct {
 
 // 新增
 func AddIndustrialManagement(item *CygxIndustrialManagement) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newId, err = o.Insert(item)
 	return
 }
 
 // 列表
 func GetIndustrialManagementAll(condition, orderColumn string) (items []*CygxIndustrialManagementNum, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *,
 		( SELECT COUNT( 1 ) FROM cygx_industrial_article_group_management AS man_g WHERE man_g.industrial_management_id = man.industrial_management_id ) AS art_num,
 		( SELECT COUNT( 1 ) FROM cygx_industrial_activity_group_management AS a_g  INNER JOIN cygx_activity AS a ON a.activity_id = a_g.activity_id  WHERE a_g.industrial_management_id = man.industrial_management_id AND a.publish_status = 1 ) AS act_num
@@ -132,7 +132,7 @@ func GetIndustrialManagementAll(condition, orderColumn string) (items []*CygxInd
 
 // 列表
 func GetIndustrialManagementAllCheckName(ChartPermissionId int, orderColumn string) (items []*CygxIndustrialManagementNumCheckName, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *
 		FROM
 		cygx_industrial_management AS man 
@@ -143,7 +143,7 @@ func GetIndustrialManagementAllCheckName(ChartPermissionId int, orderColumn stri
 }
 
 func GetIndustrialManagementAllByReportTime(condition, orderSrt string) (items []*CygxIndustrialManagementNum, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			man.*,art.publish_date,man_g.industrial_management_id as man_gid,
 			MAX( art.publish_date ) AS update_time,
@@ -170,7 +170,7 @@ func GetIndustrialManagementCount(condition string, pars []interface{}) (count i
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
@@ -178,7 +178,7 @@ func GetIndustrialManagementCount(condition string, pars []interface{}) (count i
 // 修改
 func EditIndustrialManagement(item *CygxIndustrialManagement) (err error) {
 	sql := `UPDATE cygx_industrial_management SET chart_permission_id=?, industry_name=?, recommended_index=?, layout_time=?,is_new_label=?,is_deep_label=?,is_hand_new_label=?,is_hand_deep_label=?  WHERE industrial_management_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, item.ChartPermissionId, item.IndustryName, item.RecommendedIndex, item.LayoutTime, item.IsNewLabel, item.IsDeepLabel, item.IsHandNewLabel, item.IsHandDeepLabel, item.IndustrialManagementId).Exec()
 	return
 }
@@ -186,14 +186,14 @@ func EditIndustrialManagement(item *CygxIndustrialManagement) (err error) {
 // 通过活动添加的标签产业添加的时候二次修改
 func EditIndustrialManagementFromAct(item *CygxIndustrialManagement) (err error) {
 	sql := `UPDATE cygx_industrial_management SET  recommended_index=?, layout_time=?,is_new_label=?,is_deep_label=?,is_hand_new_label=?,is_hand_deep_label=?, source = 1  WHERE industry_name=? AND chart_permission_id=?`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, item.RecommendedIndex, item.LayoutTime, item.IsNewLabel, item.IsDeepLabel, item.IsHandNewLabel, item.IsHandDeepLabel, item.IndustryName, item.ChartPermissionId).Exec()
 	return
 }
 
 // 删除数据
 func DeleteIndustrialManagement(industrialManagementId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -230,7 +230,7 @@ func GetIndustrialManagementInfo(industrialManagementId int) (item *CygxIndustri
 // 获取产业关联的文章数量
 func GetIndustrialManagementGroupArtCount(industrialManagementId int) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industrial_article_group_management WHERE industrial_management_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, industrialManagementId).QueryRow(&count)
 	return
 }
@@ -245,7 +245,7 @@ type CygxIndustrialManagementExport struct {
 }
 
 func GetChartPermissionExport(chartPermissionId int) (items []*CygxIndustrialManagementExport, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 		mp.chart_permission_name,
 		man.industry_name,
@@ -270,7 +270,7 @@ type CygxIndustrialManagementIdStr struct {
 }
 
 func GetChartPermissionIdStr() (items []*CygxIndustrialManagementIdStr, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping WHERE report_type = 1 AND chart_permission_id != 23 GROUP BY chart_permission_id  ORDER BY sort DESC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -289,7 +289,7 @@ type IndustrialManagementExport struct {
 }
 
 func GetIndustrialManagementIdStr(chartPermissionId int) (items []*IndustrialManagementExport, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_management WHERE chart_permission_id = ?`
 	_, err = o.Raw(sql, chartPermissionId).QueryRows(&items)
 	return
@@ -301,7 +301,7 @@ type GetReportNumLIstExport struct {
 }
 
 func GetReportNumLIst(industrialManagementId int) (items []*GetReportNumLIstExport, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 		rep.match_type_name,
 		COUNT(match_type_name) type_num 
@@ -324,7 +324,7 @@ type GetMatchTypeListRep struct {
 }
 
 func GetMatchTypeList(chartPermissionId int) (items []*GetMatchTypeListRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping WHERE chart_permission_id = ?  GROUP BY match_type_name `
 	_, err = o.Raw(sql, chartPermissionId).QueryRows(&items)
 	return
@@ -337,7 +337,7 @@ func GetchartPermissionReportNameCount(industrialManagementId int) (count int, e
 WHERE
 	re.report_type = 1
 	AND re.chart_permission_id = ?  `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, industrialManagementId).QueryRow(&count)
 	return
 }
@@ -350,7 +350,7 @@ type IndustrialManagementDetial struct {
 
 // 通过产业ID获取详情
 func GetindustrialManagemenById(industrialManagementId int) (item *CygxIndustrialManagementNum, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT man.layout_time, art.publish_date as create_time,
 			( SELECT COUNT( 1 ) FROM cygx_industrial_article_group_management AS man_g INNER JOIN cygx_article AS art ON art.article_id = man_g.article_id  WHERE man_g.industrial_management_id = man.industrial_management_id AND art.publish_status = 1 ) AS art_num 
 			FROM
@@ -370,7 +370,7 @@ type IndustrialManagementArtTypeList struct {
 }
 
 func GetIndustrialManagementArtTypeList(industrialManagementId int) (items []*IndustrialManagementArtTypeList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 				re.match_type_name,
 				COUNT(*) AS art_num
@@ -413,7 +413,7 @@ func GetIndustrialManagementArtTypeList(industrialManagementId int) (items []*In
 
 // 获取研选路演精华的数量
 func GetIndustrialManagementArtYxLYJH(industrialManagementId int) (total int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			COUNT(*) AS art_num 
 		FROM
@@ -442,14 +442,14 @@ func GetArtGroupIndustrialManagement(reportId int) (item []*ArtGroupIndustrialMa
 			INNER JOIN cygx_industrial_management AS man ON man.industrial_management_id = man_g.industrial_management_id 
 		WHERE
 			man_g.cygx_article_id = ?`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, reportId).QueryRows(&item)
 	return
 }
 
 // 通过ID获取详情
 func GetIndustrialManagemenDetailById(industrialManagementId int) (item *CygxIndustrialManagementDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_management WHERE industrial_management_id = ? `
 	err = o.Raw(sql, industrialManagementId).QueryRow(&item)
 	return
@@ -457,7 +457,7 @@ func GetIndustrialManagemenDetailById(industrialManagementId int) (item *CygxInd
 
 // 通过名称获取详情
 func GetIndustrialManagemenDetailByName(industryName string) (item *CygxIndustrialManagementDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_management WHERE industry_name = ? `
 	err = o.Raw(sql, industryName).QueryRow(&item)
 	return
@@ -470,14 +470,14 @@ func GetIndustrialManagementGroupArtCountByDeep(industrialManagementId int) (cou
 				WHERE
 				a.industrial_management_id = ?
 				AND b.match_type_name ='行业深度' `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, industrialManagementId).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetIndustrialManagement(condition string) (items []*ArtGroupIndustrialManagementRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_management as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -494,7 +494,7 @@ func GetindustrialManagementNames(industrialManagementIds string) (names string,
 			cygx_industrial_management AS m 
 			WHERE
 			industrial_management_id IN ( ` + industrialManagementIds + `) `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql).QueryRow(&names)
 	return
 }
@@ -513,7 +513,7 @@ func GetindustrialManagementNamesBySubjectName(subjectnName string, chartPermiss
 			cygx_industrial_subject 
 			WHERE
 			subject_name = ?) 	AND m.chart_permission_id	= ? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql, subjectnName, chartPermissionId).QueryRow(&names)
 	return
 }
@@ -525,7 +525,7 @@ type ReportMappingCategoryRep struct {
 }
 
 func GetPermissionMappingCategoryAll() (item []*ReportMappingCategoryRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_report_mapping  GROUP BY category_id `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
@@ -548,11 +548,11 @@ type CompanyHistoryRecordNewPvRep struct {
 func GetCompanyHistoryRecordNewPv(mobiles, emails string) (item []*CompanyHistoryRecordNewPvRep, err error) {
 	//var table string
 	//table = "cygx_article_history_record_all"
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
-			u.real_name,
-			u.mobile,
-			u.email,
+			h.real_name,
+			h.mobile,
+			h.email,
 			a.title,
 			a.category_id,
 			h.create_time,
@@ -576,7 +576,6 @@ func GetCompanyHistoryRecordNewPv(mobiles, emails string) (item []*CompanyHistor
 			) AS industry_name
 		FROM
 			cygx_article_history_record_all AS h
-			LEFT JOIN wx_user AS u ON u.mobile = h.mobile
 			INNER JOIN cygx_article AS a ON a.article_id = h.article_id 
 		WHERE
 			h.mobile IN (` + mobiles + `) AND h.is_del = 0  OR( h.email IN (` + emails + `) AND h.email <>'' AND h.is_del = 0 )   ORDER BY h.create_time 	DESC `
@@ -592,7 +591,7 @@ func GetManagementIdsByName(name string) (industrialManagementIds string, err er
 			cygx_industrial_management AS s
 			WHERE
 			industry_name =? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql, name).QueryRow(&industrialManagementIds)
 	return
 }
@@ -605,7 +604,7 @@ func GetManagementIdsByNameLike(name string) (industrialManagementIds string, er
 			cygx_industrial_management AS s
 			WHERE
 			industry_name LIKE '%` + name + `%'`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql).QueryRow(&industrialManagementIds)
 	return
 }
@@ -620,7 +619,7 @@ type CygxReportMappingResp struct {
 
 // 通过ID获取详情
 func GetCygxReportMappingRespByid(categoryId int) (item *CygxReportMappingResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping WHERE category_id = ? LIMIT 1`
 	err = o.Raw(sql, categoryId).QueryRow(&item)
 	return
@@ -634,18 +633,19 @@ type IndustryMove struct {
 
 // Update 更新产业
 func (industryItem *CygxIndustrialManagement) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Update(industryItem, cols...)
 	return
 }
 
 // GetIndustryListByCondition 获取产业列表
 func GetIndustryListByCondition(condition string, pars []interface{}) (list []*CygxIndustrialManagement, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_management WHERE 1 = 1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&list)
+	_, err = o.Raw(sql, pars).QueryRows(&list)
 	return
 }
 
@@ -660,6 +660,7 @@ type IndustriesEarliestLayoutTime struct {
 
 // GetIndustriesEarliestLayoutTime 获取产业最早布局时间
 func GetIndustriesEarliestLayoutTime(condition string, pars []interface{}) (list []*IndustriesEarliestLayoutTime, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 				idy.industrial_management_id,
 				idy.layout_time,
@@ -674,12 +675,13 @@ func GetIndustriesEarliestLayoutTime(condition string, pars []interface{}) (list
 		sql += condition
 	}
 	sql += ` GROUP BY idy.industrial_management_id`
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&list)
+	_, err = o.Raw(sql, pars).QueryRows(&list)
 	return
 }
 
 // GetIndustriesEarliestLayoutTimeByMorningMeeting 根据晨会精华获取产业最早布局时间
 func GetIndustriesEarliestLayoutTimeByMorningMeeting(condition string, pars []interface{}) (list []*IndustriesEarliestLayoutTime, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			idy.industrial_management_id,
 			idy.layout_time,
@@ -693,20 +695,21 @@ func GetIndustriesEarliestLayoutTimeByMorningMeeting(condition string, pars []in
 		sql += condition
 	}
 	sql += ` GROUP BY idy.industrial_management_id`
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&list)
+	_, err = o.Raw(sql, pars).QueryRows(&list)
 	return
 }
 
 // UpdateIndustryLayoutTime 更新产业布局时间
 func UpdateIndustryLayoutTime(industryId int, layoutTime string) (err error) {
 	sql := `UPDATE cygx_industrial_management SET layout_time = ? WHERE industrial_management_id = ? LIMIT 1`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, layoutTime, industryId).Exec()
 	return
 }
 
 // GetYxIndustryUseHzIndustryIds 获取研选产业的报告/活动所使用到的非研选产业IDs-即弘则覆盖
 func GetYxIndustryUseHzIndustryIds() (ids []int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT DISTINCT
 				a.industrial_management_id
 			FROM
@@ -724,13 +727,13 @@ func GetYxIndustryUseHzIndustryIds() (ids []int, err error) {
 			JOIN cygx_article AS c ON a.article_id = c.article_id
 			WHERE
 				c.article_id > 1000000 AND c.article_type_id IN  (1,2,12) AND b.chart_permission_id != 31 AND c.publish_status = 1`
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&ids)
+	_, err = o.Raw(sql).QueryRows(&ids)
 	return
 }
 
 // GetIndustryListWithHzCover 获取产业列表-带弘则覆盖
 func GetIndustryListWithHzCover(condition, conditionCover, orderRule string, isCover bool, pars []interface{}) (items []*CygxIndustrialManagementNum, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 				man.*, art.publish_date,
 				man_g.industrial_management_id AS man_gid,
@@ -815,7 +818,7 @@ type IndustrialManagement struct {
 
 // GetIndustrialManagementArticleNewPublishData 获取产业关联文章的最新发布时间
 func GetIndustrialManagementArticleNewPublishData() (items []*IndustrialManagement, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			man.industrial_management_id,
 			MAX( art.publish_date ) AS update_time 
@@ -839,7 +842,7 @@ func GetIndustrialManagementArticleNewPublishData() (items []*IndustrialManageme
 
 // 时间线的更新时间
 func GetTimeLineReportIndustrialPublishdateList(industrialIdArr []int) (items []*IndustrialManagement, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			mmc.industry_id AS industrial_management_id,
 			MAX( mm.meeting_time ) AS publish_date 
@@ -857,7 +860,7 @@ func GetTimeLineReportIndustrialPublishdateList(industrialIdArr []int) (items []
 
 // UpdateIndustrialManagementArticleNewPublishData 批量修改获取产业关联文章的最新发布时间
 func UpdateIndustrialManagementArticleNewPublishData(items map[int]string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	p, err := o.Raw("UPDATE cygx_industrial_management SET new_art_publish_date = ? WHERE industrial_management_id = ?").Prepare()
 	if err != nil {
 		return
@@ -876,11 +879,12 @@ func UpdateIndustrialManagementArticleNewPublishData(items map[int]string) (err
 
 // GetTopOneMonthArtReadNumIndustry 获取列表
 func GetTopOneMonthArtReadNumIndustryAll(condition string, pars []interface{}) (items []*IndustrialManagement, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_management WHERE 1 = 1 `
 	if condition != `` {
 		sql += condition
 	}
 	sql += ` ORDER BY article_read_num DESC `
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&items)
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/cygx/industrial_subject.go

@@ -43,14 +43,14 @@ type GetIndustrialSubjectNumList struct {
 }
 
 func GetcygxIndustrialSubject(industrialManagementId int) (items []*CygxIndustrialSubject, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT subject_name FROM cygx_industrial_subject  WHERE industrial_management_id = ?`
 	_, err = o.Raw(sql, industrialManagementId).QueryRows(&items)
 	return
 }
 
 func UpdateIndustrialManagementSubjectNames(industrialManagementId int, industryName string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	var nameSub string
 	listSub, err := GetcygxIndustrialSubject(industrialManagementId)
 	if err != nil {
@@ -67,7 +67,7 @@ func UpdateIndustrialManagementSubjectNames(industrialManagementId int, industry
 
 // 新增
 func AddIndustrialSubject(item *CygxIndustrialSubject) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newId, err = o.Insert(item)
 	if err != nil {
 		return
@@ -77,7 +77,7 @@ func AddIndustrialSubject(item *CygxIndustrialSubject) (newId int64, err error)
 
 // 批量新增
 func AddIndustrialSubjectList(items []*CygxIndustrialSubject) (newIdStr string, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -102,7 +102,7 @@ func AddIndustrialSubjectList(items []*CygxIndustrialSubject) (newIdStr string,
 
 // 列表
 func GetIndustrialSubjectAll(IndustrialManagementId int) (items []*CygxIndustrialSubjectNum, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *,
 		( SELECT COUNT( 1 ) FROM cygx_industrial_article_group_subject AS sub_g WHERE sub_g.industrial_subject_id = sub.industrial_subject_id ) AS art_num
 		FROM
@@ -119,14 +119,14 @@ func GetIndustrialSubjectCount(condition string, pars []interface{}) (count int,
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 修改
 func EditIndustrialSubject(item *CygxIndustrialSubject) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_industrial_subject SET  subject_name=? WHERE industrial_subject_id=? `
 	_, err = o.Raw(sql, item.SubjectName, item.IndustrialSubjectId).Exec()
 	return
@@ -134,7 +134,7 @@ func EditIndustrialSubject(item *CygxIndustrialSubject) (err error) {
 
 // 删除数据
 func DeleteIndustrialSubject(industrialSubjectId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_industrial_subject WHERE industrial_Subject_id = ?`
 	_, err = o.Raw(sql, industrialSubjectId).Exec()
 	return
@@ -154,7 +154,7 @@ func GetArtGroupIndustrialSubject(reportId int) (item []*ArtGroupIndustrialSubje
 		INNER JOIN cygx_industrial_subject AS sub ON sub.industrial_subject_id = sub_g.industrial_subject_id
 		WHERE
 		sub_g.cygx_article_id = ?`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, reportId).QueryRows(&item)
 	return
 }
@@ -162,14 +162,14 @@ func GetArtGroupIndustrialSubject(reportId int) (item []*ArtGroupIndustrialSubje
 // 获取标的关联的文章数量
 func GetIndustrialSubjectGroupArtCount(industrialSubjectId int) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industrial_article_group_subject WHERE industrial_subject_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, industrialSubjectId).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetIndustrialSubjectAllByIds(condition string) (items []*CygxIndustrialSubjectNum, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *,
 		( SELECT COUNT( 1 ) FROM cygx_industrial_article_group_subject AS sub_g WHERE sub_g.industrial_subject_id = sub.industrial_subject_id ) AS art_num
 		FROM
@@ -180,14 +180,14 @@ func GetIndustrialSubjectAllByIds(condition string) (items []*CygxIndustrialSubj
 }
 
 func GetIndustrialSubjectDetailById(IndustrialSubjectId int) (item *CygxIndustrialSubject, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_subject WHERE industrial_subject_id = ? `
 	err = o.Raw(sql, IndustrialSubjectId).QueryRow(&item)
 	return
 }
 
 func GetIndustrialSubjectDetailByName(IndustrialSubjectName string) (item *CygxIndustrialSubject, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_subject WHERE subject_name = ? `
 	err = o.Raw(sql, IndustrialSubjectName).QueryRow(&item)
 	return
@@ -195,13 +195,12 @@ func GetIndustrialSubjectDetailByName(IndustrialSubjectName string) (item *CygxI
 
 // 列表
 func GetIndustrialSubjectListName(condition string) (items []*ArtGroupIndustrialSubjectRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT s.*
 			FROM
 			cygx_industrial_subject AS s
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id =s.industrial_management_id
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = m.chart_permission_id
-			WHERE c.permission_name = '研选' `
+			WHERE m.chart_permission_id = 31 `
 	if condition != "" {
 		sql += condition
 	}
@@ -235,12 +234,11 @@ type SubjectNameRep struct {
 
 // 列表
 func GetIndustrialSubjectListNameByChartId(condition string) (items []*CygxIndustrialSubjectListRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT 	s.*,m.industry_name
 			FROM
 			cygx_industrial_subject AS s
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id =s.industrial_management_id
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = m.chart_permission_id
 			WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -258,14 +256,14 @@ func GetindustrialSubjectNames(subjectIds string) (names string, err error) {
 			cygx_industrial_subject AS s
 			WHERE
 			industrial_subject_id IN ( ` + subjectIds + `) `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql).QueryRow(&names)
 	return
 }
 
 // 列表
 func GetIndustrialSubjectListNameByName(condition string) (items []*CygxIndustrialSubject, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_subject WHERE 1= 1`
 	if condition != "" {
 		sql += condition
@@ -282,7 +280,7 @@ func GetIndustrialSubjectIdsByName(subjectName string) (industrialSubjectIds str
 			cygx_industrial_subject AS s
 			WHERE
 			subject_name =? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql, subjectName).QueryRow(&industrialSubjectIds)
 	return
 }
@@ -295,7 +293,7 @@ func GetIndustrialSubjectIdsByNameLike(subjectName string) (industrialSubjectIds
 			cygx_industrial_subject AS s
 			WHERE
 			subject_name  LIKE '%` + subjectName + `%'`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sql).QueryRow(&industrialSubjectIds)
 	return
 }
@@ -312,7 +310,7 @@ type IndustrySubjectArtTypeCountList struct {
 
 // GetIndustrySubjectArtTypeCountList 获取标的关联的报告数量列表-根据类型
 func GetIndustrySubjectArtTypeCountList(subjectId int) (list []*IndustrySubjectArtTypeCountList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 				re.match_type_name,
 				COUNT(*) AS art_num
@@ -341,7 +339,7 @@ func GetIndustrySubjectArtTypeCountList(subjectId int) (list []*IndustrySubjectA
 
 // 列表
 func GetIndustrySubjectListByIds(IndustrialSubjectIds string) (items []*CygxIndustrialSubject, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industrial_subject WHERE industrial_subject_id IN (` + IndustrialSubjectIds + `) `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -349,7 +347,7 @@ func GetIndustrySubjectListByIds(IndustrialSubjectIds string) (items []*CygxIndu
 
 // 获取标的列表
 func GetCygxIndustrialSubjectListCondition(condition string, pars []interface{}) (items []*CygxIndustrialSubject, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * 
 		FROM
 			cygx_industrial_subject WHERE 1 = 1 ` + condition

models/cygx/industry_fllow.go

@@ -23,7 +23,7 @@ type CygxIndustryFllow struct {
 
 // 列表
 func GetCygxIndustryFllowList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxIndustryFllow, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industry_fllow WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -39,7 +39,7 @@ func GetCygxIndustryFllowList(condition string, pars []interface{}, startSize, p
 
 // 关注产业列表
 func GetCygxIndustryFllowByUser(uid, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			m.industry_name,
 			f.modify_time as create_time,
@@ -58,7 +58,7 @@ func GetCygxIndustryFllowByUser(uid, startSize, pageSize int) (items []*UserInte
 
 // 关注产业数量
 func GetCygxIndustryFllowCount(uid int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industry_fllow  WHERE   user_id = ?  AND type = 1  `
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
@@ -66,7 +66,7 @@ func GetCygxIndustryFllowCount(uid int) (count int, err error) {
 
 // 判断用户是否关注这些产业ID
 func GetCygxIndustryFllowCountByUser(uid int, industrialManagementd string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_industry_fllow  WHERE   user_id = ?  AND type = 1 AND  industrial_management_id IN (` + industrialManagementd + `)`
 	err = o.Raw(sqlCount, uid).QueryRow(&count)
 	return
@@ -74,7 +74,7 @@ func GetCygxIndustryFllowCountByUser(uid int, industrialManagementd string) (cou
 
 // GetUserFllowIndustrialListByUserIdAndIndustrial 通过用户ID 跟产业ID获取用户关注的产业列表
 func GetUserFllowIndustrialListByUserIdAndIndustrial(userIds, industrials string) (items []*CygxIndustryFllow, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industry_fllow 
 			WHERE 1 = 1 
 		AND user_id IN ( ` + userIds + ` ) 
@@ -85,7 +85,7 @@ func GetUserFllowIndustrialListByUserIdAndIndustrial(userIds, industrials string
 
 // 批量添加
 func AddCygxIndustryFllowMulti(items []*CygxIndustryFllow) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	if len(items) > 0 {
 		//批量添加新的关注记录
 		_, err = o.InsertMulti(len(items), items)

models/cygx/industry_map.go

@@ -23,14 +23,14 @@ type CygxIndustryMapItems struct {
 }
 
 func GetCygxIndustryMapByParentId(parentId int) (items []*CygxIndustryMapItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_industry_map WHERE parent_id=?`
 	_, err = o.Raw(sql, parentId).QueryRows(&items)
 	return
 }
 
 func GetCygxIndustryMapAll() (items []*CygxIndustryMapItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_industry_map WHERE parent_id<>0`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -40,7 +40,7 @@ type CygxIndustryMapResp struct {
 	Node *CygxIndustryMapItems
 }
 
-//新增图谱
+// 新增图谱
 type IndustryMapAddReq struct {
 	IndustryMapId   int    `orm:"column(industry_map_id);" description:"行业图谱id"`
 	IndustryMapName string `description:"图谱名称"`
@@ -48,39 +48,39 @@ type IndustryMapAddReq struct {
 }
 
 func GetCygxIndustryMapByName(name string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT COUNT(1) AS count FROM cygx_industry_map WHERE industry_map_name=?`
 	err = o.Raw(sql, name).QueryRow(&count)
 	return
 }
 
 func AddCygxIndustryMap(item *CygxIndustryMap) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }
 
-//编辑图谱
+// 编辑图谱
 type IndustryMapEditReq struct {
 	IndustryMapId   int    `orm:"column(industry_map_id);" description:"行业图谱id"`
 	IndustryMapName string `description:"图谱名称"`
 }
 
 func GetCygxIndustryMapById(industryMapId int) (items *CygxIndustryMapItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_industry_map WHERE industry_map_id=?`
 	err = o.Raw(sql, industryMapId).QueryRow(&items)
 	return
 }
 
 func EditCygxIndustryMap(item *IndustryMapEditReq) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_industry_map SET industry_map_name=?,modify_time = NOW()  WHERE industry_map_id=? `
 	_, err = o.Raw(sql, item.IndustryMapName, item.IndustryMapId).Exec()
 	return
 }
 
-//编辑图谱
+// 编辑图谱
 type IndustryMapDeleteReq struct {
 	IndustryMapId int `orm:"column(industry_map_id);" description:"行业图谱id"`
 }
@@ -92,9 +92,9 @@ func DeleteCygxIndustryMap(industryMapId int) (err error) {
 	return
 }
 
-//列表
+// 列表
 func GetIndustrialMapListName(condition string) (items []*IndustryMapAddReq, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_industry_map  WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

models/cygx/interface_log.go

@@ -14,9 +14,9 @@ type CygxInterfaceLog struct {
 	CreateTime time.Time `description:"创建时间"`
 }
 
-//新增
+// 新增
 func AddCygxInterfaceLog(item *CygxInterfaceLog) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }

models/cygx/interview_apply.go

@@ -29,13 +29,11 @@ type InterviewApplyListResp struct {
 }
 
 func GetInterviewApplyList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxInterviewApply, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.real_name AS user_real_name,b.mobile,b.email,c.company_name,c.seller_id,c.seller_name AS sales_real_name,c.industry_name,d.category_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` SELECT a.*,d.category_name
 			FROM cygx_interview_apply AS a
-			LEFT JOIN wx_user AS b ON a.user_id=b.user_id
-			LEFT JOIN company_product AS c ON b.company_id=c.company_id
             LEFT JOIN cygx_article AS d on a.article_id=d.article_id
-			WHERE 1=1 AND c.product_id=2 `
+			WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
@@ -45,11 +43,9 @@ func GetInterviewApplyList(condition string, pars []interface{}, startSize, page
 }
 
 func GetInterviewApplyListCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_interview_apply AS a
-			INNER JOIN wx_user AS b ON a.user_id=b.user_id
-			INNER JOIN company_product AS c ON b.company_id=c.company_id
-            WHERE 1=1  AND c.product_id = 2  `
+            WHERE 1=1    `
 	if condition != "" {
 		sql += condition
 	}
@@ -58,13 +54,13 @@ func GetInterviewApplyListCount(condition string, pars []interface{}) (count int
 }
 
 func GetCygxInterviewApplyDetail(interviewApplyId int) (item *CygxInterviewApply, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_interview_apply WHERE interview_apply_id=? `
 	err = o.Raw(sql, interviewApplyId).QueryRow(&item)
 	return
 }
 
-//申请领取参数
+// 申请领取参数
 type InterviewApplyStatusReq struct {
 	InterviewApplyId int    `description:"访谈申请id"`
 	InterviewTime    string `description:"访谈时间"`
@@ -72,7 +68,7 @@ type InterviewApplyStatusReq struct {
 }
 
 func InterviewApplyStatusModify(interviewApplyId int, status, interviewTime string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ``
 	if interviewTime != "" {
 		sql = `UPDATE cygx_interview_apply SET status=?,modify_time=NOW() ,interview_time=? WHERE interview_apply_id=? `

models/cygx/micro_roadshow.go

@@ -53,7 +53,7 @@ type MicroRoadshowVideoListResp struct {
 }
 
 func GetMicroRoadshowVideoList(condition, sortStr string, pars []interface{}, startSize, pageSize int) (items []*CygxMicroRoadshowVideo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT *,(SELECT COUNT(1) FROM cygx_article_comment AS h    WHERE h.industry_id=v.industry_id AND  h.activity_id = 0 ) AS comment_num FROM cygx_micro_roadshow_video as v  WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -69,7 +69,7 @@ func GetMicroRoadshowVideoList(condition, sortStr string, pars []interface{}, st
 }
 
 func GetMicroRoadshowVideoListCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_micro_roadshow_video WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -78,7 +78,7 @@ func GetMicroRoadshowVideoListCount(condition string, pars []interface{}) (count
 	return
 }
 
-//视频保存请求参数
+// 视频保存请求参数
 type VideoAddReq struct {
 	VideoId           int    `description:"视频Id"`
 	VideoName         string `description:"视频标题"`
@@ -94,20 +94,20 @@ type VideoAddReq struct {
 }
 
 func GetMicroRoadshowVideoByTitle(title string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT COUNT(1) AS count FROM cygx_micro_roadshow_video WHERE video_name =? `
 	err = o.Raw(sql, title).QueryRow(&count)
 	return
 }
 
-//新增视频
+// 新增视频
 func AddMicroRoadshowVideo(item *CygxMicroRoadshowVideo) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newId, err = o.Insert(item)
 	return
 }
 
-//视频编辑请求参数
+// 视频编辑请求参数
 type VideoEditReq struct {
 	VideoId             int    `description:"视频id"`
 	VideoName           string `description:"视频标题"`
@@ -120,9 +120,9 @@ type VideoEditReq struct {
 	PublishDate         string `description:"发布时间"`
 }
 
-//新增视频
+// 新增视频
 func EditVideo(item *CygxMicroRoadshowVideo) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := " UPDATE cygx_micro_roadshow_video SET " +
 		" video_url = ?, video_name = ?,chart_permission_id=?, chart_permission_name=?, industry_id =?, industry_name =?, " +
 		" modify_date=?, publish_date=?, video_duration=?, img_url=?, share_img_url=?, detail_img_url=?, publish_status=? WHERE video_id = ? "
@@ -132,7 +132,7 @@ func EditVideo(item *CygxMicroRoadshowVideo) (err error) {
 }
 
 func PublishVideoCancel(videoId, publishOrCancle int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_micro_roadshow_video SET publish_status=?,modify_date=NOW() WHERE video_id =?`
 	_, err = o.Raw(sql, publishOrCancle, videoId).Exec()
 	return
@@ -154,7 +154,7 @@ type CygxMicroRoadshowVideoHistory struct {
 }
 
 func GetMicroRoadshowVideoHistoryByIdPage(condition string, pars []interface{}, startSize, pageSize int) (item []*CygxMicroRoadshowVideoHistory, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_micro_roadshow_video_history WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -165,7 +165,7 @@ func GetMicroRoadshowVideoHistoryByIdPage(condition string, pars []interface{},
 }
 
 func GetMicroRoadshowVideoHistoryById(condition string, pars []interface{}) (item []*CygxMicroRoadshowVideoHistory, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_micro_roadshow_video_history WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -241,7 +241,7 @@ type MicroRoadshowVoiceListResp struct {
 }
 
 func GetMicroRoadshowVoiceList(condition, sortStr string, pars []interface{}, startSize, pageSize int) (items []*CygxMicroRoadshowVoice, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 	v.*,
 	a.label,
@@ -270,7 +270,7 @@ WHERE
 }
 
 func GetMicroRoadshowVoiceListCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 	COUNT(1) AS count
 FROM
@@ -292,17 +292,15 @@ type PermissionNameAndIndustryName struct {
 }
 
 func GetPermissionNameAndIndustryNameByIndustryId(industryId int) (item *PermissionNameAndIndustryName, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-	cm.industry_name as industry_name,
-	cm.chart_permission_id AS permission_id, 
-	cp.chart_permission_name AS permission_name
-FROM
-	chart_permission AS cp
-	INNER JOIN cygx_industrial_management AS cm 
-WHERE
-	cp.chart_permission_id = cm.chart_permission_id 
-	AND cm.industrial_management_id = ? `
+			cm.industry_name as industry_name,
+			cm.chart_permission_id AS permission_id
+		FROM
+			 cygx_industrial_management AS cm 
+		WHERE
+		1=1 
+			AND cm.industrial_management_id = ? `
 
 	err = o.Raw(sql, industryId).QueryRow(&item)
 	return
@@ -330,7 +328,7 @@ type CygxMicroRoadshowVoiceHistory struct {
 }
 
 func GetMicroRoadshowVoiceHistoryById(condition string, pars []interface{}) (item []*CygxMicroRoadshowVoiceHistory, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 	h.* 
 FROM
@@ -363,29 +361,29 @@ WHERE
 }
 
 func GetMicroRoadshowVideoByIndustryId(industryId int) (item *CygxMicroRoadshowVideo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * from cygx_micro_roadshow_video where industry_id = ? `
 	err = o.Raw(sql, industryId).QueryRow(&item)
 	return
 }
 
 func GetMicroRoadshowVideoByVideoId(videoId int) (item *CygxMicroRoadshowVideo, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * from cygx_micro_roadshow_video where video_id = ? `
 	err = o.Raw(sql, videoId).QueryRow(&item)
 	return
 }
 
-//修改是否推送过模板消息的状态
+// 修改是否推送过模板消息的状态
 func UpdateIsSendWxMsg(videoId, isSendWxMsg int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_micro_roadshow_video SET is_send_wx_msg=?  WHERE video_id =?`
 	_, err = o.Raw(sql, isSendWxMsg, videoId).Exec()
 	return
 }
 
 func GetMicroRoadshowVoiceById(activityId int) (item *CygxMicroRoadshowVoice, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 	v.*,
 	a.label,

models/cygx/minutes_summary.go

@@ -130,7 +130,7 @@ func AddCygxMinutesSummaryOrm(itme *CygxMinutesSummary, items []*CygxMinutesSumm
 
 // 编辑
 func UpdateCygxMinutesSummaryOrm(item *CygxMinutesSummary, items []*CygxMinutesSummaryLog) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -171,14 +171,14 @@ func GetCygxMinutesSummary(condition string, pars []interface{}) (count int, err
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 通过纪要ID获取活动详情
 func GetCygxMinutesSummaryInfoById(articleId int) (item *CygxMinutesSummaryRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_minutes_summary  WHERE article_id=?`
 	err = o.Raw(sql, articleId).QueryRow(&item)
 	return
@@ -186,7 +186,7 @@ func GetCygxMinutesSummaryInfoById(articleId int) (item *CygxMinutesSummaryRep,
 
 // 删除数据
 func DeleteCygxMinutesSummary(articleId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -211,7 +211,7 @@ func DeleteCygxMinutesSummary(articleId int) (err error) {
 
 // 列表
 func GetMinutesSummaryList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxMinutesSummaryRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *,
 				(SELECT COUNT(1) FROM cygx_report_history_record AS h WHERE h.article_id=rs.article_id AND report_type = 'szjyhz'  AND  h.company_id != 16 ) AS pv,
         		(SELECT COUNT(DISTINCT user_id) FROM cygx_report_history_record AS h WHERE h.article_id=rs.article_id  AND report_type = 'szjyhz' AND  h.company_id != 16 ) AS uv
@@ -226,7 +226,7 @@ func GetMinutesSummaryList(condition string, pars []interface{}, startSize, page
 
 // 修改发布状态
 func MinutesSummaryPublishAndCancel(item *CygxMinutesSummaryRep) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_minutes_summary SET  publish_status=? , last_updated_time= ?, periods= ? , admin_id= ? , admin_name= ? ,have_publish = 1 WHERE article_id=? `
 	_, err = o.Raw(sql, item.PublishStatus, time.Now(), item.Periods, item.AdminId, item.AdminName, item.ArticleId).Exec()
 	return
@@ -234,7 +234,7 @@ func MinutesSummaryPublishAndCancel(item *CygxMinutesSummaryRep) (err error) {
 
 // 修改可见范围
 func MinutesSummaryVisibleRange(item *CygxMinutesSummaryRep) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_minutes_summary SET  is_send_wx_msg = 1,  visible_range=? , last_updated_time= ?,admin_id =? ,admin_name =?  WHERE article_id=? `
 	_, err = o.Raw(sql, item.VisibleRange, time.Now(), item.AdminId, item.AdminName, item.ArticleId).Exec()
 	return
@@ -242,7 +242,7 @@ func MinutesSummaryVisibleRange(item *CygxMinutesSummaryRep) (err error) {
 
 // 列表
 func GetMinutesSummarylogListAll(articleId int) (items []*ResearchSummaryChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	//sql := `SELECT c.permission_name ,c.image_url,l.*
 	//		FROM
 	//		cygx_minutes_summary_log AS l
@@ -262,11 +262,10 @@ func GetMinutesSummarylogListAll(articleId int) (items []*ResearchSummaryChartPe
 
 // 列表
 func GetMinutesSummarylogSonListSecond(articleId int, artType string) (items []*CygxResearchSummaryLogSecond, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,c.chart_permission_id ,c.image_url, l.* 
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT  l.* 
 			FROM
 			cygx_minutes_summary_log AS l
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			WHERE l.article_id = ? AND l.type =?
 			GROUP BY l.chart_permission_id
 			ORDER  BY l.chart_permission_sort ASC`
@@ -276,7 +275,7 @@ func GetMinutesSummarylogSonListSecond(articleId int, artType string) (items []*
 
 // 列表
 func GetMinutesSummarylogListThird(articleId, chartPermissionId int, artType string) (items []*CygxResearchSummaryLogThird, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT  l.link_article_id,l.body ,a.video_url
 			FROM cygx_minutes_summary_log AS l
 			LEFT JOIN cygx_article as a ON a.article_id = l.link_article_id
@@ -302,7 +301,7 @@ type CygxMinutesSummaryLogDetail struct {
 
 // 列表
 func GetMinutesSummarylogSonListAll(articleId, chartPermissionId int) (items []*CygxMinutesSummaryLogDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT   l.link_article_id,l.body ,a.video_url 
 			FROM
 			cygx_minutes_summary_log AS l

models/cygx/minutes_summary_log.go

@@ -69,17 +69,16 @@ type CygxMSlFirstList struct {
 }
 
 func GetCygxMinutesSummaryLogRepList(articleId int, typeStr string) (items []*CygxMinutesSummaryLogRep, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT l.*,c.chart_permission_name,c.image_url as  ico_link
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT l.*
 			FROM cygx_minutes_summary_log AS l
-			LEFT JOIN chart_permission as c  ON c.chart_permission_id = l.chart_permission_id
 			WHERE  1= 1 AND article_id=?  AND type =? GROUP BY l.chart_permission_id `
 	_, err = o.Raw(sql, articleId, typeStr).QueryRows(&items)
 	return
 }
 
 func GetCygxMinutesSummaryLogRepListSon(articleId, chartPermissionId int, typeStr string) (items []*AddCygxResearchSummaryLog, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT l.* FROM cygx_minutes_summary_log AS l
 			WHERE  1= 1 AND l.article_id=?  AND l.chart_permission_id =? AND l.type =? `
 	_, err = o.Raw(sql, articleId, chartPermissionId, typeStr).QueryRows(&items)
@@ -87,7 +86,7 @@ func GetCygxMinutesSummaryLogRepListSon(articleId, chartPermissionId int, typeSt
 }
 
 func GetCygxMinutesSummaryYanxList(articleId int, typeStr string) (items []*AddCygxMinutesSummaryLog, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT l.* FROM cygx_minutes_summary_log AS l
 			WHERE  1= 1 AND l.article_id=? AND l.type =?  `
 	_, err = o.Raw(sql, articleId, typeStr).QueryRows(&items)

models/cygx/product_interior.go

@@ -48,7 +48,7 @@ type ProductInteriorIdReq struct {
 
 // 添加
 func AddProductInterior(item *CygxProductInterior, industrialManagementIds, industrialSubjectIds string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -99,7 +99,7 @@ func AddProductInterior(item *CygxProductInterior, industrialManagementIds, indu
 
 // 修改
 func UpdateProductInterior(item *CygxProductInterior, industrialManagementIds, industrialSubjectIds string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -217,14 +217,14 @@ func GetCygxProductInteriorCount(condition string, pars []interface{}) (count in
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxProductInteriorList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxProductInteriorResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_product_interior as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -240,7 +240,7 @@ type GetCygxProductInteriorDetailResp struct {
 
 // 通过ID获取详情
 func GetCygxProductInteriorDetail(productInteriorId int) (item *CygxProductInteriorResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_product_interior  WHERE product_interior_id=? `
 	err = o.Raw(sql, productInteriorId).QueryRow(&item)
 	return
@@ -248,7 +248,7 @@ func GetCygxProductInteriorDetail(productInteriorId int) (item *CygxProductInter
 
 // 删除数据
 func DeleteProductInterior(productInteriorId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_product_interior WHERE product_interior_id = ?`
 	_, err = o.Raw(sql, productInteriorId).Exec()
 	return
@@ -256,7 +256,7 @@ func DeleteProductInterior(productInteriorId int) (err error) {
 
 // 修改是否展示
 func EditProductInteriorStatus(status, isCancel, productInteriorId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_product_interior SET status=?,is_cancel = ? ,visible_range=0, modify_time=NOW()   WHERE product_interior_id=? `
 	_, err = o.Raw(sql, status, isCancel, productInteriorId).Exec()
 	return
@@ -264,7 +264,7 @@ func EditProductInteriorStatus(status, isCancel, productInteriorId int) (err err
 
 // 修改可见范围
 func ProductInteriorVisibleRange(visibleRange, productInteriorId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_product_interior SET visible_range=?, modify_time=NOW()   WHERE product_interior_id=?  `
 	_, err = o.Raw(sql, visibleRange, productInteriorId).Exec()
 	return
@@ -272,7 +272,7 @@ func ProductInteriorVisibleRange(visibleRange, productInteriorId int) (err error
 
 // 修改是否推送过模板消息的状态
 func UpdateProductInteriorIsSendWxMsg(productInteriorId, isSendWxMsg int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_product_interior SET is_send_wx_msg=?  WHERE product_interior_id =?`
 	_, err = o.Raw(sql, isSendWxMsg, productInteriorId).Exec()
 	return

models/cygx/product_interior_history.go

@@ -23,7 +23,7 @@ type CygxProductInteriorHistory struct {
 
 // 列表
 func GetCygxProductInteriorHistoryList(condition string, pars []interface{}) (items []*CygxProductInteriorHistory, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_product_interior_history as art WHERE 1= 1 `
 	condition += `  AND company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) // 过滤弘则来源
 	if condition != "" {

models/cygx/product_interior_industrial_group_management.go

@@ -13,16 +13,14 @@ type CygxProductInteriorIndustrialGroupManagement struct {
 }
 
 func GetProductInteriorIndustrialGroupManagementList(productInteriorId int) (items []*IndustrialActivityGroupManagementRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			p.permission_name,
-			p.chart_permission_id,
+			m.chart_permission_id,
 			m.industrial_management_id,
 			m.industry_name 
 			FROM
 			cygx_product_interior_industrial_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.product_interior_id = ? `
 	_, err = o.Raw(sql, productInteriorId).QueryRows(&items)
@@ -37,7 +35,7 @@ type IndustrialProductInteriorGroupResp struct {
 
 // 列表
 func GetProductInteriorIndustrialGroupManagement(condition string, pars []interface{}) (items []*IndustrialProductInteriorGroupResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT  mg.*,m.industry_name  FROM
 	        cygx_product_interior_industrial_group_management AS mg
 	      	 INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 

models/cygx/product_interior_industrial_group_subject.go

@@ -14,7 +14,7 @@ type CygxProductInteriorIndustrialGroupSubject struct {
 
 // 列表
 func GetProductInteriorIndustrialGroupSubjecttList(productInteriorId int) (items []*SubjectActivityGroupManagementRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			s.subject_name,
 			s.industrial_subject_id 
@@ -43,7 +43,7 @@ type SubjectlProductInteriorGroupResp struct {
 
 // 列表
 func GetProductInteriorIndustrialGroupSubjectt(condition string, pars []interface{}) (items []*SubjectlProductInteriorGroupResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			sg.*,
 			s.subject_name,

models/cygx/product_interior_msg.go

@@ -21,7 +21,7 @@ type CygxProductInteriorMsg struct {
 
 // 列表
 func GetCygxProductInteriorMsgList(condition string, pars []interface{}) (items []*CygxProductInteriorMsg, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_product_interior_msg as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

models/cygx/report_article.go

@@ -73,14 +73,14 @@ type GetReportArticleListRep struct {
 
 // 新增
 func AddReportArticle(item *CygxReportArticle) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }
 
 // 列表
 func GetReportArticleList(condition string, pars []interface{}, startSize, pageSize, isClass int) (items []*CygxReportArticle, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ``
 	if isClass == 1 {
 		sql = `SELECT
@@ -136,13 +136,13 @@ func GetReportArticleList(condition string, pars []interface{}, startSize, pageS
 
 // 获取文章PV、UV
 func GetReportArticleListPvUv(condition string) (items []*CygxReportArticle, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-				( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h INNER JOIN wx_user AS u ON u.user_id = h.user_id WHERE h.article_id = art.article_id AND h.platfor = 1 AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS pv,
-				(SELECT COUNT( DISTINCT h.user_id ) FROM cygx_article_history_record_all AS h INNER JOIN wx_user AS u ON u.user_id = h.user_id  WHERE h.article_id = art.article_id  AND h.platfor = 1  AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS uv,
+				( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h  WHERE h.article_id = art.article_id AND h.platfor = 1 AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS pv,
+				(SELECT COUNT( DISTINCT h.user_id ) FROM cygx_article_history_record_all AS h WHERE h.article_id = art.article_id  AND h.platfor = 1  AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS uv,
 				( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h  WHERE h.article_id = art.article_id AND h.platfor = 2 AND is_del = 0  AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS cl_pv,
 				(SELECT COUNT( DISTINCT h.user_id ) FROM cygx_article_history_record_all AS h   WHERE h.article_id = art.article_id  AND h.platfor = 2  AND is_del = 0  AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS cl_uv,
-				( 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 = art.article_id ) AS collection_num,
+				( SELECT COUNT( 1 ) FROM cygx_article_collect AS c WHERE c.article_id = art.article_id ) AS collection_num,
 				art.article_id
 			FROM
 				cygx_article AS art
@@ -165,14 +165,14 @@ func GetReportArticleCount(condition string, pars []interface{}) (count int, err
 				LEFT JOIN cygx_report_mapping AS ret ON ret.category_id = art.category_id_two
 				LEFT JOIN cygx_report_mapping AS re ON re.category_id = art.category_id
 				LEFT JOIN cygx_industrial_article_group_management AS man ON man.article_id = art.article_id  WHERE 1= 1 ` + condition + ` GROUP BY art.article_id) as a `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 获取数量
 func GetCygxArticleCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_article as art WHERE 1= 1  `
 	if condition != "" {
 		sqlCount += condition
@@ -191,7 +191,7 @@ func GetCygxArticleCount(condition string, pars []interface{}) (count int, err e
 
 // 过滤
 func FilterReportArticle(reportArticleId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -236,7 +236,7 @@ type CygxReportArticleItems struct {
 }
 
 func GetReportArticleId(reportArticleId int) (items *CygxReportArticleItems, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_article WHERE id=? `
 	err = o.Raw(sql, reportArticleId).QueryRow(&items)
 	return
@@ -244,7 +244,7 @@ func GetReportArticleId(reportArticleId int) (items *CygxReportArticleItems, err
 
 // 报告分类第一次添加
 func ReportArticleClassificationAdd(reportId, industrialManagementId, articleId int, ndustrialSubjectIdStr string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -285,7 +285,7 @@ func ReportArticleClassificationAdd(reportId, industrialManagementId, articleId
 
 // 报告分类的新增与修改
 func ReportArticleClassificationEdit(reportId, industrialManagementId, articleId int, ndustrialSubjectIdStr string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -342,7 +342,7 @@ type PermissionMappingCategoryRep struct {
 }
 
 func GetPermissionMappingCategoryID() (item []*PermissionMappingCategoryRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT category_id FROM cygx_report_mapping WHERE report_type = 1 AND category_id  not IN (67)  GROUP BY category_id `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
@@ -350,7 +350,7 @@ func GetPermissionMappingCategoryID() (item []*PermissionMappingCategoryRep, err
 
 // 报告分类的新增与修改
 func ReportArticleClassificationEditNew(reportId int, industrialManagementIdStr string, articleId int, ndustrialSubjectIdStr string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -415,15 +415,12 @@ type ReportExportRep struct {
 }
 
 func GetReportExportRep(article_id int, sqlStr string) (item []*ReportExportRep, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT h.create_time,h.company_name,h.stop_time,u.real_name ,	p.seller_name,h.id
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` SELECT h.*
 			FROM
 			cygx_article_history_record_newpv AS h
-			LEFT JOIN wx_user AS u ON u.user_id = h.user_id 
-			LEFT JOIN cygx_article AS art ON art.article_id = h.article_id 
-			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
+			LEFT JOIN cygx_article AS art ON art.article_id = h.article_id
 			WHERE art.id  = ?` + sqlStr
-	fmt.Println(sql)
 	_, err = o.Raw(sql, article_id).QueryRows(&item)
 	return
 }
@@ -439,7 +436,7 @@ type ReportMatchTypeNameList struct {
 }
 
 func GetMatchTypeName(categoryId int) (items []*ReportMatchTypeName, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping 
 			WHERE
 			chart_permission_id = (
@@ -489,14 +486,14 @@ type ArticleDetail struct {
 }
 
 func GetArticleDetailById(articleId int) (item *ArticleDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article WHERE id = ? `
 	err = o.Raw(sql, articleId).QueryRow(&item)
 	return
 }
 
 func GetArticleDetailByArticleId(articleId int) (item *ArticleDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article WHERE article_id = ? `
 	err = o.Raw(sql, articleId).QueryRow(&item)
 	return
@@ -510,7 +507,7 @@ type UpdateReportMatchTypeNameRep struct {
 
 // 手动修改匹配类型
 func UpdateReportMatchTypeName(matchTypeName string, reportType, categoryId, reportId, isSummary, isClass int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -554,7 +551,7 @@ func UpdateReportMatchTypeName(matchTypeName string, reportType, categoryId, rep
 }
 
 func GetArticleDetailByMd5Id(md5Id string) (item *ArticleDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *FROM cygx_article WHERE article_id_md5 = ? `
 	err = o.Raw(sql, md5Id).QueryRow(&item)
 	return
@@ -579,7 +576,7 @@ func AddAReportrticle(item *CygxArticle, chartPermissionId int, industryName, su
 	var total int
 	itemIndustrialManagementGroup := new(CygxIndustrialArticleGroupManagement)
 	itemIndustrialSubjectGroup := new(CygxIndustrialArticleGroupSubject)
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -655,7 +652,7 @@ func EditReportrticle(item *CygxArticle, chartPermissionId int, industryName, su
 	newId := item.SummaryManageId
 	itemIndustrialManagementGroup := new(CygxIndustrialArticleGroupManagement)
 	itemIndustrialSubjectGroup := new(CygxIndustrialArticleGroupSubject)
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -787,7 +784,7 @@ type CygxArticleReport struct {
 
 // 通过纪要ID获取文章详情
 func GetArticleIdInfoByreportIdEdit(articleId int) (item *CygxArticleReport, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.* ,m.industry_name,
 			GROUP_CONCAT(DISTINCT s.subject_name  SEPARATOR ',') AS subject_name
@@ -805,7 +802,7 @@ func GetArticleIdInfoByreportIdEdit(articleId int) (item *CygxArticleReport, err
 
 // 修改文章关联的标的ID
 func UpdateSubjecIds(subjecIds string, industrialManagementId, articleId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	var industrialAndSubjectIds string
 	industrialAndSubjectIds = strings.Replace(strings.Replace(subjecIds, "{|1|}", "", -1), "{|2|}", "", -1)
 	fmt.Println(industrialAndSubjectIds)
@@ -816,7 +813,7 @@ func UpdateSubjecIds(subjecIds string, industrialManagementId, articleId int) (e
 
 // 删除研选报告，以及相关归类，收藏
 func DeleteArticleReport(articleId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -885,7 +882,7 @@ type AddArticleRoadshowEssenceRep struct {
 func AddArticleRoadshowEssence(item *CygxArticle, industryIds, subjectIds string) (newId int64, err error) {
 	itemIndustrialManagementGroup := new(CygxIndustrialArticleGroupManagement)
 	itemIndustrialSubjectGroup := new(CygxIndustrialArticleGroupSubject)
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -937,7 +934,7 @@ func AddArticleRoadshowEssence(item *CygxArticle, industryIds, subjectIds string
 func UpdateArticleRoadshowEssence(item *CygxArticle, industryIds, subjectIds string) (err error) {
 	itemIndustrialManagementGroup := new(CygxIndustrialArticleGroupManagement)
 	itemIndustrialSubjectGroup := new(CygxIndustrialArticleGroupSubject)
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -1054,7 +1051,7 @@ func GetArticleRoadshowEssenceList(condition string, pars []interface{}, startSi
 
 // 列表
 func GetArticlList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxArticle, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *
 				FROM cygx_article as art WHERE 1= 1 `
 	if condition != "" {
@@ -1067,7 +1064,7 @@ func GetArticlList(condition string, pars []interface{}, startSize, pageSize int
 
 // 修改发布状态
 func RoadshowEssencePublishAndCancel(item *CygxResearchSummaryRep) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_article SET  publish_status=? , last_updated_time= ?, periods= ?,admin_id =? ,admin_name =? ,have_publish = 1 WHERE article_id=? `
 	_, err = o.Raw(sql, item.PublishStatus, time.Now(), item.Periods, item.AdminId, item.AdminName, item.ArticleId).Exec()
 	return
@@ -1085,7 +1082,7 @@ func RoadshowEssencePublishAndCancel(item *CygxResearchSummaryRep) (err error) {
 //}
 
 func UpdateArticleInfoVideo(reportId int, tbName, videoUrl, videoName, videoSize string, playSeconds float64) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE ` + tbName + ` SET video_url=?,video_name=?,video_play_seconds=?,video_size=? WHERE article_id=? `
 	_, err = o.Raw(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Exec()
 	return
@@ -1143,7 +1140,7 @@ type CompanyOtherHistoryListResp struct {
 
 // 文章列表
 func GetArticleCollectList(condition string) (items []*CygxArticleCollect, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			c.*,
 			a.title,
@@ -1175,7 +1172,7 @@ func GetArticleCollectList(condition string) (items []*CygxArticleCollect, err e
 
 // 产业列表
 func GetCygxIndustryList(companyId int) (items []*CygxArticleIndustry, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			f.user_id,f.create_time,m.industrial_management_id,m.industry_name
 		FROM
@@ -1190,7 +1187,7 @@ func GetCygxIndustryList(companyId int) (items []*CygxArticleIndustry, err error
 
 // 作者列表
 func GetArticleDepartmentList(companyId int) (items []*ArticleDepartment, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			f.user_id,f.create_time,m.department_id,m.nick_name,
 			(SELECT
@@ -1211,7 +1208,7 @@ func GetArticleDepartmentList(companyId int) (items []*ArticleDepartment, err er
 
 // 关键词列表
 func GetCygxSearchKeyWordList(userIdStr string) (items []*KeyWord, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_search_key_word  WHERE user_id IN (` + userIdStr + `)`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -1219,7 +1216,7 @@ func GetCygxSearchKeyWordList(userIdStr string) (items []*KeyWord, err error) {
 
 // 关键词列表
 func GetCygxUserSearchKeyWordList(userIdStr string) (items []*KeyWord, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_user_search_key_word  WHERE user_id IN (` + userIdStr + `) AND  page_type IN ('ReortSearch','HomeSearch')`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -1244,7 +1241,7 @@ type CompanyArticleCountListResp struct {
 }
 
 func GetCompanyHistoryRecordPvGroupDate(mobiles, emails string) (item []*CreateTimesResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT date_format(create_time,'%Y-%m') as create_times FROM cygx_article_history_record_all AS h
 			INNER JOIN cygx_article art ON art.article_id = h.article_id
 			WHERE  h.mobile IN (` + mobiles + `) AND h.is_del = 0  OR( h.email IN (` + emails + `) AND h.email <>'' AND h.is_del = 0 ) GROUP BY create_times    ORDER BY create_times DESC  `
@@ -1253,7 +1250,7 @@ func GetCompanyHistoryRecordPvGroupDate(mobiles, emails string) (item []*CreateT
 }
 
 func GetCompanyHistoryRecordPv(mobiles, emails string) (item []*CompanyHistoryRecordNewPvRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT
 			a.title,
 			a.category_id,
@@ -1282,7 +1279,7 @@ type CygxCelueArticleHistoryRecord struct {
 }
 
 func GetCygxCelueArticleHistoryRecordPvAll(articleIds string) (item []*ArticleHistoryRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article_history_record_all as  h WHERE article_id IN ( ` + articleIds + ` )  AND   h.is_del = 0  AND h.company_id != 16   AND h.platfor = 2  `
 	sql += ` ORDER BY create_time DESC  `
 	_, err = o.Raw(sql).QueryRows(&item)
@@ -1330,6 +1327,7 @@ type ArticleDetailResp struct {
 
 // GetArticleIdsFromIndustryAndSubjectGroupByKeyword 产业/标的关键词获取文章IDs
 func GetArticleIdsFromIndustryAndSubjectGroupByKeyword(keyword string) (ids []int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT DISTINCT
 				mg.article_id
 			FROM
@@ -1349,7 +1347,7 @@ func GetArticleIdsFromIndustryAndSubjectGroupByKeyword(keyword string) (ids []in
 			WHERE
 				1 = 1
 			AND s.subject_name LIKE ?`
-	_, err = orm.NewOrm().Raw(sql, keyword, keyword).QueryRows(&ids)
+	_, err = o.Raw(sql, keyword, keyword).QueryRows(&ids)
 	return
 }
 
@@ -1361,7 +1359,7 @@ type SummaryArticleStock struct {
 
 // 综述报告
 func GetArticleStock() (items []*SummaryArticleStock, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			stock,article_id
 		FROM

models/cygx/report_mapping_category_group.go

@@ -28,7 +28,8 @@ type CygxReportMappingCategoryGroupResp struct {
 
 // AddCygxReportMappingCategoryGroupMulti 批量添加
 func AddCygxReportMappingCategoryGroupMulti(items []*CygxReportMappingCategoryGroup, articleId int) (err error) {
-	o, err := orm.NewOrm().Begin()
+
+	o, err := orm.NewOrmUsingDB("hz_cygx").Begin()
 	if err != nil {
 		return
 	}
@@ -55,7 +56,7 @@ func AddCygxReportMappingCategoryGroupMulti(items []*CygxReportMappingCategoryGr
 
 // 列表
 func GetCygxReportMappingCategoryGroupList(condition string, pars []interface{}) (items []*CygxReportMappingCategoryGroupResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping_category_group as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

models/cygx/report_mapping_celue.go

@@ -39,7 +39,7 @@ type CygxReportMappingCelueResp struct {
 
 // 获取category_id 最大的值，进行累加
 func GetCygxReportMappingCelueMaxDetail() (item *CygxReportMappingCelue, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT  * FROM cygx_report_mapping_celue  ORDER BY category_id DESC  LIMIT 1 `
 	err = o.Raw(sql).QueryRow(&item)
 	return
@@ -47,7 +47,7 @@ func GetCygxReportMappingCelueMaxDetail() (item *CygxReportMappingCelue, err err
 
 // 列表
 func GetCygxReportMappingList(condition string, pars []interface{}) (items []*CygxReportMappingCelueResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping   WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -58,7 +58,7 @@ func GetCygxReportMappingList(condition string, pars []interface{}) (items []*Cy
 
 // 列表
 func GetCygxReportMappingCelueList(condition string, pars []interface{}) (items []*CygxReportMappingCelueResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping_celue   WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

models/cygx/report_mapping_cygx.go

@@ -35,7 +35,7 @@ type CygxReportMappingCygxAdd struct {
 
 // 列表
 func GetCygxReportMappingCygxList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxReportMappingCygx, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping_cygx as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -51,7 +51,7 @@ func GetCygxReportMappingCygxList(condition string, pars []interface{}, startSiz
 
 // 列表
 func GetCygxReportMappingCygxByCon(condition string, pars []interface{}) (items []*CygxReportMappingCygx, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping_cygx as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -73,7 +73,7 @@ func GetCygxReportMappingCygxCount(condition string, pars []interface{}) (count
 
 // 添加
 func AddCygxReportMappingCygx(itemCygx *CygxReportMappingCygx, itemCelue *CygxReportMappingCelue) (itemCygxId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -106,7 +106,7 @@ func AddCygxReportMappingCygx(itemCygx *CygxReportMappingCygx, itemCelue *CygxRe
 
 // 通过ID获取详情
 func GetCygxReportMappingCygxDetail(Id int) (item *CygxReportMappingCygx, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping_cygx  WHERE id=? `
 	err = o.Raw(sql, Id).QueryRow(&item)
 	return
@@ -114,7 +114,7 @@ func GetCygxReportMappingCygxDetail(Id int) (item *CygxReportMappingCygx, err er
 
 // 通过ID获取详情
 func GetCygxReportMappingCygxDetailByName(name string) (item *CygxReportMappingCygx, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping_cygx  WHERE match_type_name=?  LIMIT 1 `
 	err = o.Raw(sql, name).QueryRow(&item)
 	return

models/cygx/report_mapping_group.go

@@ -15,7 +15,7 @@ type CygxReportMappingGroup struct {
 
 // 列表
 func GetCygxReportMappingGroupList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxReportMappingGroup, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_mapping_group as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

models/cygx/report_selection.go

@@ -126,7 +126,7 @@ type ReportSelectionId struct {
 
 // 添加
 func AddCygxReportSelectionOrm(itme *CygxReportSelection, items []*CygxReportSelectionLog, itemsChart []*CygxReportSelectionChartLog) (newArtId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -162,7 +162,7 @@ func AddCygxReportSelectionOrm(itme *CygxReportSelection, items []*CygxReportSel
 
 // 编辑
 func UpdateCygxReportSelectionOrm(item *CygxReportSelection, items []*CygxReportSelectionLog, itemsChart []*CygxReportSelectionChartLog) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -216,14 +216,14 @@ func GetCygxReportSelection(condition string, pars []interface{}) (count int, er
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 通过纪要ID获取活动详情
 func GetCygxReportSelectionInfoById(articleId int) (item *CygxReportSelectionRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_selection  WHERE article_id=?`
 	err = o.Raw(sql, articleId).QueryRow(&item)
 	return
@@ -231,7 +231,7 @@ func GetCygxReportSelectionInfoById(articleId int) (item *CygxReportSelectionRep
 
 // 通过纪要ID获取活动详情
 func GetCygxReportSelectionInfoByPeriods(periods string) (item *CygxReportSelectionRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_selection  WHERE periods=?`
 	err = o.Raw(sql, periods).QueryRow(&item)
 	return
@@ -239,7 +239,7 @@ func GetCygxReportSelectionInfoByPeriods(periods string) (item *CygxReportSelect
 
 // 删除数据
 func DeleteCygxReportSelection(articleId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -264,7 +264,7 @@ func DeleteCygxReportSelection(articleId int) (err error) {
 
 // 列表
 func GetReportSelectionList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxReportSelectionRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *,
 				(SELECT COUNT(1) FROM cygx_report_history_record AS h WHERE h.article_id=rs.article_id AND report_type = 'bgjx' AND  h.company_id != 16 ) AS pv,
         		(SELECT COUNT(DISTINCT user_id) FROM cygx_report_history_record AS h WHERE h.article_id=rs.article_id  AND report_type = 'bgjx' AND  h.company_id != 16 ) AS uv
@@ -279,7 +279,7 @@ func GetReportSelectionList(condition string, pars []interface{}, startSize, pag
 
 // 修改发布状态
 func ReportSelectionPublishAndCancel(item *CygxReportSelectionRep) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_report_selection SET  publish_status=? , last_updated_time= ?, periods= ? ,admin_id =? ,admin_name =? ,have_publish = 1 WHERE article_id=? `
 	_, err = o.Raw(sql, item.PublishStatus, time.Now(), item.Periods, item.AdminId, item.AdminName, item.ArticleId).Exec()
 	return
@@ -287,7 +287,7 @@ func ReportSelectionPublishAndCancel(item *CygxReportSelectionRep) (err error) {
 
 // 修改可见范围
 func ReportSelectionVisibleRange(item *CygxReportSelectionRep) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_report_selection SET  is_send_wx_msg = 1, visible_range=? , last_updated_time= ?,admin_id =? ,admin_name =?  WHERE article_id=? `
 	_, err = o.Raw(sql, item.VisibleRange, time.Now(), item.AdminId, item.AdminName, item.ArticleId).Exec()
 	return
@@ -305,7 +305,7 @@ type CygxReportSelectionPeriodsListRep struct {
 
 // 期数列表
 func GetReportSelectionListPeriods(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxReportSelectionPeriodsRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT periods FROM cygx_report_selection as rs WHERE have_publish = 1`
 	if condition != "" {
 		sql += condition
@@ -328,11 +328,10 @@ type CygxReportSelectionLogDetail struct {
 
 // 列表
 func GetReportSelectionlogSonListAll(articleId, chartPermissionId int) (items []*CygxReportSelectionLogDetail, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,s.subject_name , l.* 
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT l.* 
 			FROM
 			cygx_report_selection_log AS l
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			INNER JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = l.industrial_subject_id 
 			WHERE l.article_id = ? AND l.chart_permission_id =?`
 	_, err = o.Raw(sql, articleId, chartPermissionId).QueryRows(&items)
@@ -341,7 +340,7 @@ func GetReportSelectionlogSonListAll(articleId, chartPermissionId int) (items []
 
 // 获取，bgjx:报告精选、bzyjhz:本周研究汇总、szjyhz:上周纪要汇总 阅读记录
 func GetReportSelectionHistoryList(articleId int, condition string) (items []*ArticleHistoryRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			h.real_name,
 			h.mobile,
@@ -366,7 +365,7 @@ type CygxArticleIdAndTableResp struct {
 
 // 通过纪要ID获取不同类型报告的title详情
 func GetArticleInfoByIdAndTable(table string, articleId int) (item *CygxArticleIdAndTableResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT title FROM ` + table + `  WHERE article_id=?`
 	err = o.Raw(sql, articleId).QueryRow(&item)
 	return

models/cygx/report_selection_chart_log.go

@@ -26,10 +26,9 @@ type AddCygxReportSelectionChartLog struct {
 }
 
 func GetCygxReportSelectionChartLogRepList(articleId int) (items []*CygxReportSelectionChartLogRep, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT l.*,c.chart_permission_name
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT l.*
 			FROM cygx_report_selection_chart_log AS l
-			LEFT JOIN chart_permission as c  ON c.chart_permission_id = l.chart_permission_id
 			WHERE  1= 1 AND article_id=?  `
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return

models/cygx/report_selection_log.go

@@ -69,18 +69,8 @@ type CygxReportSelectionChart struct {
 	BodyChartSummary    string                        `description:"行业核心逻辑汇总"`
 }
 
-func GetCygxReportSelectionLogRepList(articleId int, typeStr string) (items []*CygxReportSelectionLogRep, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT l.*,c.chart_permission_name,c.image_url as  ico_link
-			FROM cygx_report_selection_log AS l
-			LEFT JOIN chart_permission as c  ON c.chart_permission_id = l.chart_permission_id
-			WHERE  1= 1 AND article_id=?   GROUP BY l.chart_permission_id `
-	_, err = o.Raw(sql, articleId, typeStr).QueryRows(&items)
-	return
-}
-
 func GetCygxReportSelectionLogRepListSon(articleId, chartPermissionId int) (items []*CygxReportSelectionLogResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 	l.*, l.company_label as label,
 	l.subject_name as industrial_subject_name,
@@ -94,7 +84,7 @@ FROM
 }
 
 func GetCygxReportSelectionSjdpList(articleId int, typeStr string) (items []*CygxReportSelectionLogRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT l.* FROM cygx_research_summary_log AS l
 			WHERE  1= 1 AND l.article_id=? AND l.type =?  `
 	_, err = o.Raw(sql, articleId, typeStr).QueryRows(&items)
@@ -118,11 +108,10 @@ type CygxReportSelectionLoglist struct {
 
 // 列表
 func GetReportSelectionlogListAll(articleId int) (items []*CygxReportSelectionLoglist, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,c.image_url,s.subject_name , l.* 
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT  l.* 
 			FROM
 			cygx_report_selection_log AS l
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			INNER JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = l.industrial_subject_id 
 			WHERE l.article_id = ? `
 	_, err = o.Raw(sql, articleId).QueryRows(&items)

models/cygx/report_selection_log_apply.go

@@ -30,14 +30,14 @@ func GetCygxReportSelectionLogApplyCount(condition string, pars []interface{}) (
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxReportSelectionLogApplyRespList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxReportSelectionLogApplyResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_report_selection_log_apply as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

models/cygx/report_selection_subject_history.go

@@ -20,7 +20,7 @@ type CygxReportSelectionSubjectHistory struct {
 
 // 列表
 func GetCygxReportSelectionSubjectHistoryList(articleId int) (items []*CygxReportSelectionSubjectHistory, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * 
 			FROM
 			cygx_report_selection_subject_history AS l

models/cygx/research_summary.go

@@ -102,7 +102,7 @@ type ResearchSummaryId struct {
 
 // 添加
 func AddCygxResearchSummaryOrm(itme *CygxResearchSummary, items []*CygxResearchSummaryLog) (newArtId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -131,7 +131,7 @@ func AddCygxResearchSummaryOrm(itme *CygxResearchSummary, items []*CygxResearchS
 
 // 编辑
 func UpdateCygxResearchSummaryOrm(item *CygxResearchSummary, items []*CygxResearchSummaryLog) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -171,14 +171,14 @@ func GetCygxResearchSummary(condition string, pars []interface{}) (count int, er
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 通过纪要ID获取活动详情
 func GetCygxResearchSummaryInfoById(articleId int) (item *CygxResearchSummaryRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_research_summary  WHERE article_id=?`
 	err = o.Raw(sql, articleId).QueryRow(&item)
 	return
@@ -186,7 +186,7 @@ func GetCygxResearchSummaryInfoById(articleId int) (item *CygxResearchSummaryRep
 
 // 删除数据
 func DeleteCygxResearchSummary(articleId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -211,7 +211,7 @@ func DeleteCygxResearchSummary(articleId int) (err error) {
 
 // 列表
 func GetResearchSummaryList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxResearchSummaryRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *,
 				(SELECT COUNT(1) FROM cygx_report_history_record AS h WHERE h.article_id=rs.article_id AND report_type = 'bzyjhz' AND  h.company_id != 16) AS pv,
         		(SELECT COUNT(DISTINCT user_id) FROM cygx_report_history_record AS h WHERE h.article_id=rs.article_id  AND report_type = 'bzyjhz' AND  h.company_id != 16 ) AS uv
@@ -226,7 +226,7 @@ func GetResearchSummaryList(condition string, pars []interface{}, startSize, pag
 
 // 修改发布状态
 func ResearchSummaryPublishAndCancel(item *CygxResearchSummaryRep) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_research_summary SET  publish_status=? , last_updated_time= ?, periods= ? ,admin_id =? ,admin_name =? ,have_publish = 1 WHERE article_id=? `
 	_, err = o.Raw(sql, item.PublishStatus, time.Now(), item.Periods, item.AdminId, item.AdminName, item.ArticleId).Exec()
 	return
@@ -234,7 +234,7 @@ func ResearchSummaryPublishAndCancel(item *CygxResearchSummaryRep) (err error) {
 
 // 修改可见范围
 func ResearchSummaryVisibleRange(item *CygxResearchSummaryRep) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_research_summary SET  is_send_wx_msg = 1,  visible_range=? , last_updated_time= ?,admin_id =? ,admin_name =?  WHERE article_id=? `
 	_, err = o.Raw(sql, item.VisibleRange, time.Now(), item.AdminId, item.AdminName, item.ArticleId).Exec()
 	return
@@ -253,7 +253,7 @@ type CygxRSlChartPermissionIcoTmps struct {
 
 // 列表
 func GetResearchSummarylogListFirst(articleId int) (items []*ResearchSummaryChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT l.* 
 			FROM cygx_research_summary_log AS l 
 			WHERE l.article_id = ? 
@@ -282,11 +282,10 @@ type CygxResearchSummaryLogThird struct {
 
 // 列表
 func GetResearchSummarylogSonListSecond(articleId int, artType string) (items []*CygxResearchSummaryLogSecond, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,c.chart_permission_id ,c.image_url, l.* 
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT  l.* 
 			FROM
 			cygx_research_summary_log AS l
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			WHERE l.article_id = ? AND l.type =?
 			GROUP BY l.chart_permission_id
 			ORDER  BY l.chart_permission_sort ASC`
@@ -296,7 +295,7 @@ func GetResearchSummarylogSonListSecond(articleId int, artType string) (items []
 
 // 列表
 func GetResearchSummarylogSonListThird(articleId, chartPermissionId int, artType string) (items []*CygxResearchSummaryLogThird, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT  l.link_article_id,l.body ,a.video_url
 			FROM cygx_research_summary_log AS l
 			LEFT JOIN cygx_article as a ON a.article_id = l.link_article_id

models/cygx/research_summary_log.go

@@ -82,17 +82,16 @@ type CygxRSlFirstList struct {
 }
 
 func GetCygxResearchSummaryLogRepList(articleId int, typeStr string) (items []*CygxResearchSummaryLogRep, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT l.*,c.chart_permission_name,c.image_url as  ico_link
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT l.*
 			FROM cygx_research_summary_log AS l
-			LEFT JOIN chart_permission as c  ON c.chart_permission_id = l.chart_permission_id
 			WHERE  1= 1 AND article_id=?  AND type =? GROUP BY l.chart_permission_id `
 	_, err = o.Raw(sql, articleId, typeStr).QueryRows(&items)
 	return
 }
 
 func GetCygxResearchSummaryLogRepListSon(articleId, chartPermissionId int, typeStr string) (items []*AddCygxResearchSummaryLog, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT l.* FROM cygx_research_summary_log AS l
 			WHERE  1= 1 AND l.article_id=?  AND l.chart_permission_id =? AND l.type =?  `
 	_, err = o.Raw(sql, articleId, chartPermissionId, typeStr).QueryRows(&items)
@@ -100,7 +99,7 @@ func GetCygxResearchSummaryLogRepListSon(articleId, chartPermissionId int, typeS
 }
 
 func GetCygxResearchSummarySjdpList(articleId int, typeStr string) (items []*AddCygxMinutesSummaryLog, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT l.* FROM cygx_research_summary_log AS l
 			WHERE  1= 1 AND l.article_id=? AND l.type =?  `
 	_, err = o.Raw(sql, articleId, typeStr).QueryRows(&items)

models/cygx/resource_data.go

@@ -19,7 +19,7 @@ type CygxResourceData struct {
 
 // 根据资源类型获取列表
 func GetCygxResourceDataListBysource(source string) (items []*CygxResourceData, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_resource_data as art WHERE 1= 1  AND  source = ? `
 	_, err = o.Raw(sql, source).QueryRows(&items)
 	return
@@ -27,14 +27,14 @@ func GetCygxResourceDataListBysource(source string) (items []*CygxResourceData,
 
 // 添加
 func AddCygxResourceData(item *CygxResourceData) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	lastId, err = o.Insert(item)
 	return
 }
 
 // 删除数据
 func DeleteResourceData(sourceId int, source string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_resource_data WHERE source_id = ? AND source =?  `
 	_, err = o.Raw(sql, sourceId, source).Exec()
 	return
@@ -42,7 +42,7 @@ func DeleteResourceData(sourceId int, source string) (err error) {
 
 // 修改数据
 func UpdateResourceData(sourceId int, source, publishDate string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_resource_data SET publish_date=?  WHERE source_id=?  AND source =? `
 	_, err = o.Raw(sql, publishDate, sourceId, source).Exec()
 	return
@@ -50,7 +50,7 @@ func UpdateResourceData(sourceId int, source, publishDate string) (err error) {
 
 // 修改
 func UpdateResourceDataByItem(item *CygxResourceData) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	updateParams := make(map[string]interface{})
 	updateParams["PublishDate"] = item.PublishDate
 	updateParams["SearchTag"] = item.SearchTag
@@ -69,7 +69,7 @@ func UpdateResourceDataByItem(item *CygxResourceData) (err error) {
 
 // 获取数量
 func GetCygxReportSelectionBySourceAndId(sourceId int, source string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_resource_data  WHERE  source_id = ? AND source =?  `
 	err = o.Raw(sqlCount, sourceId, source).QueryRow(&count)
 	return
@@ -77,7 +77,7 @@ func GetCygxReportSelectionBySourceAndId(sourceId int, source string) (count int
 
 // 通过ID跟资源获取详情
 func GetCygxResourceDataByIdAndSource(sourceId int, source string) (item *CygxResourceData, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_resource_data WHERE  source_id = ? AND source =?  `
 	err = o.Raw(sql, sourceId, source).QueryRow(&item)
 	return

models/cygx/resource_data_industrial_group_management.go

@@ -27,7 +27,7 @@ type CygxResourceDataIndustrialGroupSubject struct {
 
 // 添加
 func AddCygxResourceDataGroup(sourceId int, source string, industrialItems []*CygxResourceDataIndustrialGroupManagement, subjectItems []*CygxResourceDataIndustrialGroupSubject) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -73,7 +73,7 @@ func AddCygxResourceDataGroup(sourceId int, source string, industrialItems []*Cy
 
 // 删除
 func DeleteCygxResourceDataGroup(sourceId int, source string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return

models/cygx/search_keyword.go

@@ -21,19 +21,19 @@ func GetSearchKeyWordCount(condition string, pars []interface{}) (count int, err
 		sqlCount += condition
 	}
 	sqlCount += ` GROUP BY key_word) as aa`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
-//获取搜索关键词列表
+// 获取搜索关键词列表
 func GetSearchKeyWordList(condition string, pars []interface{}, startSize, pageSize int) (items []*KeyWordList, err error) {
 	sql := `SELECT COUNT( key_word ) AS key_word_num, key_word FROM cygx_search_key_word WHERE 1= 1`
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` GROUP BY key_word ORDER BY COUNT( key_word ) DESC LIMIT ?,? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
@@ -55,52 +55,36 @@ type KeyWordListDownload struct {
 	SellerName  string `description:"销售人员名称"`
 }
 
-//获取7天搜索关键词列表
+// 获取7天搜索关键词列表
 func GetSearchKeyWordListDownload(starTime, endTime string) (items []*KeyWordListDownload, err error) {
 	sql := `SELECT
-		kw.key_word,
-		kw.create_time,
-		wx.mobile,
-		wx.email,
-		wx.real_name,
-        wx.company_id,
-		co.company_name
+		kw.*
 	FROM
 		cygx_search_key_word as kw
-		LEFT   JOIN wx_user as wx ON  wx.user_id = kw.user_id
-		LEFT  JOIN company as co ON  co.company_id = wx.company_id
 	WHERE
  		kw.create_time > ?
 		AND kw.create_time < ?
 		AND wx.company_id > 1
 	ORDER  BY
 		kw.create_time DESC`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, starTime, endTime).QueryRows(&items)
 	return
 }
 
-//销售获取7天搜索关键词列表
+// 销售获取7天搜索关键词列表
 func GetSearchKeyWordListDownloadSeller(starTime, endTime, sqlStr string) (items []*KeyWordListDownload, err error) {
 	sql := `SELECT
-		kw.key_word,
-		kw.create_time,
-		wx.mobile,
-		wx.email,
-		wx.real_name,
-        wx.company_id,
-		co.company_name
+		kw.*
 	FROM
 		cygx_search_key_word as kw
-		LEFT   JOIN wx_user as wx ON  wx.user_id = kw.user_id
-		LEFT  JOIN company as co ON  co.company_id = wx.company_id
 	WHERE
  		kw.create_time > ?
 		AND kw.create_time < ?
 		AND wx.company_id > 1` + sqlStr +
 		` ORDER  BY
 		kw.create_time DESC`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, starTime, endTime).QueryRows(&items)
 	return
 }
@@ -130,7 +114,6 @@ func GetCompanyProductMoreOneList(starTime, endTime string) (items []*CompanyPro
 			wx.company_id
 			FROM
 			cygx_search_key_word as kw
-			LEFT   JOIN wx_user as wx ON  wx.user_id = kw.user_id
 			WHERE
 			kw.create_time > ?
 			AND kw.create_time < ?
@@ -138,7 +121,7 @@ func GetCompanyProductMoreOneList(starTime, endTime string) (items []*CompanyPro
 			GROUP BY wx.company_id
 			ORDER  BY
 			kw.create_time DESC`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, starTime, endTime).QueryRows(&items)
 	return
 }
@@ -149,20 +132,7 @@ type CompanyProductNameAndSeller struct {
 	SellerName  string `description:"销售人员名称"`
 }
 
-func GetCompanyProductNameAndSellerList(companyId int) (items []*CompanyProductNameAndSeller, err error) {
-	sql := `SELECT 	 
-		ad.real_name as seller_name,
-        cp.product_name
-		FROM
-		company_product as cp
-		INNER JOIN admin AS ad ON cp.seller_id = ad.admin_id
-		WHERE company_id = ?`
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, companyId).QueryRows(&items)
-	return
-}
-
-//获取开通产品种类大于一的客户
+// 获取开通产品种类大于一的客户
 func GetCompanyProductNameAndSellerAllList(pars []interface{}, companyIdStrr string) (items []*CompanyProductNameAndSeller, err error) {
 	sql := `SELECT 	 
 		ad.real_name as seller_name,

models/cygx/summary_fastsearch_keywords.go

@@ -29,17 +29,17 @@ type SummaryFastsearchKeywordsListResp struct {
 	List []*SummaryFastsearchKeywords
 }
 
-//列表
+// 列表
 func GetSummaryFastsearchKeywordsList() (items []*SummaryFastsearchKeywords, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_summary_fastsearch_keywords  ORDER BY sort DESC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
-//添加快捷搜索词
+// 添加快捷搜索词
 func AddSummaryFastsearchKeywords(items []*CygxSummaryFastsearchKeywords) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return

models/cygx/summary_manage.go

@@ -155,7 +155,7 @@ type ElasticTestArticleDetail struct {
 
 // 添加文章
 func AddArticle(item *CygxArticle) (newId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newId, err = o.Insert(item)
 	fmt.Println(newId)
 	return
@@ -168,7 +168,7 @@ func AddArticle(item *CygxArticle) (newId int64, err error) {
 
 // 修改文章
 func EditArticle(item *CygxArticle, oldPublishStatus int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	if oldPublishStatus == 1 {
 		sql := `UPDATE cygx_article SET category_name=?, title=?, abstract=?, body=?, body_text=?, publish_status=?,last_updated_time = ?,seller_and_mobile=?,expert_background =?, expert_number=? ,interview_date=?, file_link=? ,chart_permission_ids =? WHERE id=? AND source = 1`
 		_, err = o.Raw(sql, item.CategoryName, item.Title, item.Abstract, item.Body, item.BodyText, item.PublishStatus, item.LastUpdatedTime, item.SellerAndMobile, item.ExpertBackground, item.ExpertNumber, item.InterviewDate, item.FileLink, item.ChartPermissionIds, item.SummaryManageId).Exec()
@@ -185,7 +185,7 @@ func EditArticle(item *CygxArticle, oldPublishStatus int) (err error) {
 }
 
 func GetMaxArticleIdInfo() (item *ArticleDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article   ORDER BY article_id desc  LIMIT 1`
 	err = o.Raw(sql).QueryRow(&item)
 	return
@@ -193,7 +193,7 @@ func GetMaxArticleIdInfo() (item *ArticleDetail, err error) {
 
 // 通过纪要ID获取文章详情
 func GetArticleIdInfoBySummaryManageId(summaryManageId int) (item *CygxArticleResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT art.* ,dm.nick_name  FROM cygx_article as art 
 			LEFT JOIN cygx_article_department as dm ON dm.department_id = art.department_id  WHERE id=? AND source = 1`
 	err = o.Raw(sql, summaryManageId).QueryRow(&item)
@@ -202,7 +202,7 @@ func GetArticleIdInfoBySummaryManageId(summaryManageId int) (item *CygxArticleRe
 
 // 通过文章ID获取文章、以及所关联的标的详情
 func GetArticleInfoOtherByArticleId(articleId int) (item *CygxArticleResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT art.* ,dm.nick_name  FROM cygx_article as art 
 			LEFT JOIN cygx_article_department as dm ON dm.department_id = art.department_id  WHERE article_id=? `
 	err = o.Raw(sql, articleId).QueryRow(&item)
@@ -211,7 +211,7 @@ func GetArticleInfoOtherByArticleId(articleId int) (item *CygxArticleResp, err e
 
 // 通过纪要ID获取文章详情
 func GetArticleIdInfoByArticleId(articleId int) (item *CygxArticle, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article  WHERE article_id= ?`
 	err = o.Raw(sql, articleId).QueryRow(&item)
 	return
@@ -234,7 +234,7 @@ func GetReportContentTextSub(content string) (contentSub string, err error) {
 // 修改发布状态
 func PublishAndCancel(item *CygxArticle) (err error) {
 	sql := `UPDATE cygx_article SET  publish_status=? ,admin_id =? ,admin_name =?  WHERE article_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, item.PublishStatus, item.AdminId, item.AdminName, item.ArticleId).Exec()
 	return
 }
@@ -242,7 +242,7 @@ func PublishAndCancel(item *CygxArticle) (err error) {
 // 修改发布状态
 func ArticleVisibleRange(item *CygxArticle) (err error) {
 	sql := `UPDATE cygx_article SET  visible_range=? ,admin_id =? ,admin_name =?  WHERE article_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, item.VisibleRange, item.AdminId, item.AdminName, item.ArticleId).Exec()
 	return
 }
@@ -250,14 +250,14 @@ func ArticleVisibleRange(item *CygxArticle) (err error) {
 // 修改发布状态
 func UpdateIsClassFail(item *CygxArticleResp) (err error) {
 	sql := `UPDATE cygx_article SET  is_class_fail=0  WHERE article_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sql, item.ArticleId).Exec()
 	return
 }
 
 // 通过纪要ID获取文章详情
 func GetArticleIdInfoBySummaryManageIdEdit(summaryManageId int) (item *CygxArticle, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article  WHERE id=? AND source = 1`
 	err = o.Raw(sql, summaryManageId).QueryRow(&item)
 	return
@@ -265,7 +265,7 @@ func GetArticleIdInfoBySummaryManageIdEdit(summaryManageId int) (item *CygxArtic
 
 // 删除数据
 func DeleteSummaryManage(summaryManageId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_article  WHERE id=? AND source = 1`
 	_, err = o.Raw(sql, summaryManageId).Exec()
 	return
@@ -298,10 +298,10 @@ type CygxArticleList struct {
 func GetSummaryManageList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxArticleList, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT 
-		(SELECT COUNT(1) FROM cygx_article_history_record_newpv AS h   INNER JOIN wx_user as u ON  u.user_id = h.user_id  WHERE h.article_id=art.article_id AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS pv,
-	   	(SELECT COUNT(DISTINCT h.user_id) FROM cygx_article_history_record_newpv AS h  INNER JOIN wx_user as u ON  u.user_id = h.user_id WHERE h.article_id=art.article_id AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS uv,
-		(SELECT COUNT(1) FROM cygx_article_comment AS k   INNER JOIN wx_user as u ON  u.user_id = k.user_id WHERE k.article_id=art.article_id) AS comment_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 = art.article_id ) AS collection_num,
+		(SELECT COUNT(1) FROM cygx_article_history_record_newpv AS h   WHERE h.article_id=art.article_id AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS pv,
+	   	(SELECT COUNT(DISTINCT h.user_id) FROM cygx_article_history_record_newpv AS h  WHERE h.article_id=art.article_id AND h.company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) + ` ) AS uv,
+		(SELECT COUNT(1) FROM cygx_article_comment AS k    WHERE k.article_id=art.article_id) AS comment_num,
+		(SELECT COUNT(1) FROM cygx_article_collect AS c   WHERE c.article_id = art.article_id ) AS collection_num,
 		(SELECT GROUP_CONCAT(DISTINCT s.subject_name  SEPARATOR '/')  FROM cygx_industrial_subject as s  WHERE s.industrial_management_id = m.industrial_management_id) AS subject_name ,
 		art.title ,art.category_name ,art.publish_date ,art.id,art.last_updated_time,art.publish_status,art.abstract,art.body,art.article_id_md5 ,art.article_id,dm.nick_name , art.department_id,m.industry_name,art.article_type_id,art.article_type_name,art.visible_range
 		FROM cygx_article as art 
@@ -318,7 +318,7 @@ func GetSummaryManageList(condition string, pars []interface{}, startSize, pageS
 
 // 列表
 func GetCygxArticleList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxReportArticle, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT *
 		FROM cygx_article as art WHERE  1 =1 `
 	if condition != "" {
@@ -341,7 +341,7 @@ func GetArticleSubjectList(articleId string) (items []*CygxArticleSubjectList, e
 	if articleId == "" {
 		articleId = "0"
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT GROUP_CONCAT( DISTINCT s.subject_name SEPARATOR '/' )  AS subject_name,
 			 sg.article_id
 			FROM
@@ -360,7 +360,7 @@ func GetASummaryManageCount(condition string, pars []interface{}) (count int, er
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
@@ -501,19 +501,13 @@ func BodyAnalysis(body string) (expertNumStr, expertContentStr, interviewDateStr
 
 // 列表
 func GetCygxArticleCollectionList(articleId int) (items []*CygxDepartmentFllowList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			u.real_name,
-			c.company_name,
-			c.seller_name,
-			f.create_time 
+			f.* 
 		FROM
 			cygx_article_collect AS f
-			INNER JOIN wx_user AS u ON u.user_id = f.user_id
-			LEFT JOIN company_product AS c ON c.company_id = u.company_id 
 		WHERE
-			f.article_id = ? 
-			AND c.product_id = 2
+			f.article_id = ?
 			GROUP BY f.id`
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return
@@ -531,19 +525,11 @@ type ArticleHistoryRep struct {
 
 // 列表
 func GetArticleHistoryList(articleId int, condition string) (items []*ArticleHistoryRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			u.real_name,
-			h.mobile,
-			h.company_name,
-			m.real_name as seller_name,
-			h.stop_time,
-			h.create_time
+			h.*
 			FROM
-				cygx_article_history_record_all AS h 
-				INNER JOIN wx_user as u ON u.user_id = h.user_id
-				INNER JOIN company_product as c ON c.company_id = h.company_id
-				INNER JOIN admin as m ON m.admin_id = c.seller_id
+				cygx_article_history_record_all AS h
 			WHERE
 				h.article_id = ?
 				AND h.platfor = 1
@@ -557,19 +543,11 @@ func GetArticleHistoryList(articleId int, condition string) (items []*ArticleHis
 
 // 用户阅读记录，不过滤弘则内部的
 func GetArticleHistoryListOld(articleId int, condition string) (items []*ArticleHistoryRep, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			u.real_name,
-			h.mobile,
-			h.company_name,
-			m.real_name as seller_name,
-			h.stop_time,
-			h.create_time
+			h.*
 			FROM
-				cygx_article_history_record AS h 
-				INNER JOIN wx_user as u ON u.mobile = h.mobile
-				INNER JOIN company_product as c ON c.company_id = h.company_id
-				INNER JOIN admin as m ON m.admin_id = c.seller_id
+				cygx_article_history_record AS h
 			WHERE
 				h.article_id = ?
 				AND c.product_id = 2`
@@ -594,7 +572,7 @@ type ArticleTypeAndAbstract struct {
 }
 
 func GetArticleTypeAndAbstract() (list []*ArticleTypeAndAbstract, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 	* 
 FROM

models/cygx/tactics_time_line.go

@@ -32,14 +32,14 @@ type TacticsTimeLineTimeLineIdReq struct {
 
 // 添加
 func AddCygxTacticsTimeLine(item *CygxTacticsTimeLine) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }
 
 // 修改
 func UpdateCygxTacticsTimeLine(item *CygxTacticsTimeLine) (err error) {
-	to := orm.NewOrm()
+	to := orm.NewOrmUsingDB("hz_cygx")
 	updateParams := make(map[string]interface{})
 	updateParams["PublishTime"] = item.PublishTime
 	updateParams["ModifyTime"] = item.ModifyTime
@@ -84,14 +84,14 @@ func GetCygxTacticsTimeLineCount(condition string, pars []interface{}) (count in
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxTacticsTimeLineList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxTacticsTimeLineResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_tactics_time_line as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -107,7 +107,7 @@ type GetCygxTacticsTimeLineDetailResp struct {
 
 // 通过ID获取详情
 func GetCygxTacticsTimeLineDetail(timeLineId int) (item *CygxTacticsTimeLineResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_tactics_time_line  WHERE time_line_id=? `
 	err = o.Raw(sql, timeLineId).QueryRow(&item)
 	return
@@ -115,7 +115,7 @@ func GetCygxTacticsTimeLineDetail(timeLineId int) (item *CygxTacticsTimeLineResp
 
 // 删除数据
 func DeleteCygxTacticsTimeLine(timeLineId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_tactics_time_line WHERE time_line_id = ?`
 	_, err = o.Raw(sql, timeLineId).Exec()
 	return
@@ -123,7 +123,7 @@ func DeleteCygxTacticsTimeLine(timeLineId int) (err error) {
 
 // 修改是否展示
 func EditCygxTacticsTimeLineStatus(status, timeLineId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_tactics_time_line SET status=?, modify_time=NOW()   WHERE time_line_id=? `
 	_, err = o.Raw(sql, status, timeLineId).Exec()
 	return
@@ -131,7 +131,7 @@ func EditCygxTacticsTimeLineStatus(status, timeLineId int) (err error) {
 
 // 一键修改所有的是否展示
 func EditCygxTacticsTimeLineStatusAll(status int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	to, err := o.Begin()
 	if err != nil {
 		return

models/cygx/tactics_time_line_history.go

@@ -23,7 +23,7 @@ type CygxTacticsTimeLineHistory struct {
 
 // 列表
 func GetCygxTacticsTimeLineHistoryList(condition string, pars []interface{}) (items []*CygxTacticsTimeLineHistory, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_tactics_time_line_history as art WHERE 1= 1 `
 	condition += `  AND company_id != ` + strconv.Itoa(utils.HZ_COMPANY_ID) // 过滤弘则来源
 	if condition != "" {

models/cygx/tag_history.go

@@ -22,7 +22,7 @@ type CygxTagHistory struct {
 
 // 列表
 func GetCygxTagHistoryList(condition string, pars []interface{}) (items []*CygxTagHistory, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_tag_history as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -37,7 +37,7 @@ func GetCygxTagHistoryCount(condition string, pars []interface{}) (count int, er
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
@@ -49,7 +49,7 @@ func GetCygxTagHistoryCountUv(tagId int) (count int, err error) {
 		FROM
 			( SELECT count(*) FROM cygx_tag_history WHERE 1 = 1 AND tag_id = ? GROUP BY user_id ) b `
 
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, tagId).QueryRow(&count)
 	return
 }
@@ -57,7 +57,7 @@ func GetCygxTagHistoryCountUv(tagId int) (count int, err error) {
 // 获取数量
 func GetCygxTagHistoryCountPv(tagId int) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_tag_history as art WHERE 1= 1  AND tag_id = ? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, tagId).QueryRow(&count)
 	return
 }
@@ -67,7 +67,7 @@ func GetCygxTagHistoryCountByUserId(userId int) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_tag_history as a 
 	INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id 
 	WHERE a.user_id=? ORDER BY a.create_time  `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, userId).QueryRow(&count)
 	return
 }
@@ -76,7 +76,7 @@ func GetCygxTagHistoryCountByUserId(userId int) (count int, err error) {
 func GetCygxTagHistoryByUserId(userId, startSize, pageSize int) (list []*UserInteraction, err error) {
 	sqlCount := ` SELECT b.*,a.create_time FROM cygx_tag_history as a INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id 
 WHERE a.user_id=? ORDER BY a.create_time DESC LIMIT ?,? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sqlCount, userId, startSize, pageSize).QueryRows(&list)
 	return
 }
@@ -90,7 +90,7 @@ func GetCygxTagHistoryCountByCompanyId(companyId int, condition string) (count i
 		sqlCount += condition
 	}
 	sqlCount += ` WHERE a.company_id=? ) AS t `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, companyId).QueryRow(&count)
 	return
 }
@@ -107,7 +107,7 @@ FROM cygx_tag_history as a
 	}
 	sqlCount += ` 
 	WHERE a.company_id=? ORDER BY tag_num DESC ,create_time DESC LIMIT ?,? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Raw(sqlCount, companyId, startSize, pageSize).QueryRows(&list)
 	return
 }
@@ -115,10 +115,9 @@ FROM cygx_tag_history as a
 // 获取数量
 func GetCygxTagHistoryCountByCompanyIds(companyIds, condition string) (count int, err error) {
 	sqlCount := ` SELECT a.real_name,a.mobile,b.*,ci.tag_num,ui.tag_num AS ui_tag_num,a.company_name  FROM cygx_tag_history as a  
-	INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id 
-	LEFT JOIN company_product AS p ON a.company_id=p.company_id 
+	INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id
 	LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = a.company_id 
-	LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = a.user_id WHERE p.product_id=2 `
+	LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = a.user_id WHERE 1=1 `
 	if companyIds != "" {
 		sqlCount += `AND a.company_id IN ( ` + companyIds + `) `
 	}
@@ -136,10 +135,9 @@ func GetCygxTagHistoryByCompanyIds(companyIds, condition string, startSize, page
 	sqlCount := ` SELECT a.real_name,a.mobile,ci.tag_num,ui.tag_num AS ui_tag_num,a.company_name, a.create_time AS create_time,
 b.tag_id,b.tag_name,b.article_types,b.activity_types,b.industries,b.subject_names
 FROM cygx_tag_history as a 
-INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id 
-LEFT JOIN company_product AS p ON a.company_id=p.company_id 
+INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id
 LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = a.company_id 
-LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = a.user_id WHERE p.product_id=2 `
+LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = a.user_id WHERE 1=1 `
 	if companyIds != "" {
 		sqlCount += `AND a.company_id IN ( ` + companyIds + `) `
 	}
@@ -155,8 +153,7 @@ LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = a.user_id WHERE p.prod
 // 获取数量
 func GetCygxTagHistoryCountByCompanyIdCondition(condition string) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_tag_history as a  
-	INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id 
-	INNER JOIN company_product AS p ON a.company_id=p.company_id WHERE p.product_id=2`
+	INNER JOIN cygx_tag AS b ON a.tag_id = b.tag_id  WHERE 1=1`
 	if condition != "" {
 		sqlCount += condition
 	}

models/cygx/three_api_log.go

@@ -14,17 +14,9 @@ type CygxThreeApiLog struct {
 	Source     int       `description:"来源1，易董"`
 }
 
-//添加日志记录
+// 添加日志记录
 func AddCygxThreeApiLog(item *CygxThreeApiLog) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	lastId, err = o.Insert(item)
 	return
 }
-
-//三十天之后的日志自行删除
-func DeleteCygxThreeApiLog() (err error) {
-	o := orm.NewOrm()
-	sql := `DELETE FROM cygx_three_api_log WHERE  DATE_SUB(CURDATE(), INTERVAL 30 DAY) > date(create_time)`
-	_, err = o.Raw(sql).Exec()
-	return
-}

models/cygx/user_label.go

@@ -35,21 +35,21 @@ func GetCygxUserLabelCount(condition string, pars []interface{}) (count int, err
 	if condition != "" {
 		sqlCount += condition
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
 // 添加
 func AddCygxUserLabel(item *CygxUserLabel) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	lastId, err = o.Insert(item)
 	return
 }
 
 // 修改是否关注
 func UpdateCygxUserLabelIsFollow(isFollow, sourceId, source, userId int, label string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_user_label SET is_follow=?,label = ? , modify_time=NOW()  WHERE source_id=? AND source = ? AND user_id = ? `
 	_, err = o.Raw(sql, isFollow, label, sourceId, source, userId).Exec()
 	return
@@ -57,7 +57,7 @@ func UpdateCygxUserLabelIsFollow(isFollow, sourceId, source, userId int, label s
 
 // 修改对应标签权重+1
 func UpdateCygxUserLabelWeight(sourceId, source, userId int, label string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_user_label SET weight = weight +1 ,label = ? , modify_time=NOW()  WHERE source_id=? AND source = ? AND  user_id = ? `
 	_, err = o.Raw(sql, label, sourceId, source, userId).Exec()
 	return
@@ -65,7 +65,7 @@ func UpdateCygxUserLabelWeight(sourceId, source, userId int, label string) (err
 
 // 列表
 func GetCygxUserLabelList(condition string, pars []interface{}) (items []*CygxUserLabel, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_user_label as art WHERE 1= 1   AND modify_time > DATE_SUB(CURDATE(), INTERVAL 3 MONTH)	`
 	if condition != "" {
 		sql += condition

models/cygx/user_label_activity.go

@@ -21,7 +21,7 @@ type CygxUserLabelActivity struct {
 
 // 列表
 func GetCygxUserLabelActivity(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxUserLabelActivity, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_user_label_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -37,7 +37,7 @@ func AddCygxUserLabelActivityList(items []*CygxUserLabelActivity) (lastId int64,
 	if lenitems == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.InsertMulti(1, items)
 	return
 }

models/cygx/user_label_activity_special.go

@@ -21,7 +21,7 @@ type CygxUserLabelActivitySpecial struct {
 
 // 列表
 func GetCygxUserLabelActivitySpecial(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxUserLabelActivitySpecial, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_user_label_activity_special as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -37,7 +37,7 @@ func AddCygxUserLabelActivitySpecialList(items []*CygxUserLabelActivitySpecial)
 	if lenitems == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.InsertMulti(1, items)
 	return
 }

models/cygx/user_remind.go

@@ -21,14 +21,14 @@ type CygxUserRemind struct {
 
 // 添加
 func AddCygxUserRemind(item *CygxUserRemind) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	lastId, err = o.Insert(item)
 	return
 }
 
 // AddCygxUserRemindMulti 批量添加
 func AddCygxUserRemindMulti(items []*CygxUserRemind) (err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("hz_cygx").Begin()
 	if err != nil {
 		return
 	}
@@ -51,28 +51,29 @@ type CygxUserRemindResp struct {
 }
 
 func RemoveCygxUserRemind(userId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `DELETE FROM cygx_user_remind WHERE user_id=? `
 	_, err = o.Raw(sql, userId).Exec()
 	return
 }
 
 func RemoveCygxUserRemindByCompanyId(companyId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `DELETE FROM cygx_user_remind WHERE company_id = ? `
 	_, err = o.Raw(sql, companyId).Exec()
 	return
 }
 
 func GetCygxUserRemindCount(userId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT COUNT(1) AS count FROM cygx_user_remind WHERE user_id=? `
-	err = orm.NewOrm().Raw(sql, userId).QueryRow(&count)
+	err = o.Raw(sql, userId).QueryRow(&count)
 	return
 }
 
 // 列表
 func GetCygxUserRemindList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxUserRemind, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_user_remind as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -88,7 +89,7 @@ func GetCygxUserRemindList(condition string, pars []interface{}, startSize, page
 
 // 根据公司ID获取列表
 func GetCygxUserRemindListByCompanyId(companyId int) (items []*CygxUserRemind, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_user_remind  WHERE 1= 1  AND company_id = ? `
 	_, err = o.Raw(sql, companyId).QueryRows(&items)
 	return

models/cygx/xzs_choose_send.go

@@ -20,25 +20,25 @@ type CygxXzsChooseSend struct {
 	ModifyTime   time.Time `description:"更新时间"`
 }
 
-//获取提交过推送规则用户的userId
+// 获取提交过推送规则用户的userId
 func GetCygxXzsChooseSend(condition string) (items []*CygxXzsChooseSend, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_xzs_choose_send WHERE 1 =1  ` + condition
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
-//获取某个行业勾选全部赛道的用户
+// 获取某个行业勾选全部赛道的用户
 func GetCygxXzsChooseSendByAllIn(allIn string) (items []*CygxXzsChooseSend, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_xzs_choose_send  WHERE ` + allIn + ` = 1	`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
-//修改某个用户的行业是否勾选全部赛道
+// 修改某个用户的行业是否勾选全部赛道
 func UpdateCygxXzsChooseSendIsAllIn(allIn string, isAllIn, userId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_xzs_choose_send SET ` + allIn + ` = ? WHERE user_id = ?`
 	_, err = o.Raw(sql, isAllIn, userId).Exec()
 	return

services/cygx/activity_wx_msg.go

@@ -59,12 +59,12 @@ func SendWxMsgWithCygxActivityUpdateLimitPeople(activityId int) (err error) {
 	if mobileLen == 0 {
 		return
 	}
-	condition = ""
-	pars = make([]interface{}, 0)
-	condition += ` AND u.mobile IN (` + utils.GetOrmInReplace(mobileLen) + `)`
-	pars = append(pars, mobileArr)
+	//condition = ""
+	//pars = make([]interface{}, 0)
+	//condition += ` AND u.mobile IN (` + utils.GetOrmInReplace(mobileLen) + `)`
+	//pars = append(pars, mobileArr)
 
-	openIdList, e := cygx.GetWxOpenIdBList(condition, pars)
+	openIdList, e := cygx.GetUserRecordListByMobileArr(mobileArr)
 	if e != nil {
 		err = errors.New("GetWxOpenIdBList, Err: " + e.Error())
 		return
@@ -121,8 +121,8 @@ func SendWxMsgWithCygxActivitySignUpBySell(items []*cygx.CygxSignupUser) (err er
 	if len(items) == 0 {
 		return
 	}
-	var condition string
-	var pars []interface{}
+	//var condition string
+	//var pars []interface{}
 
 	for _, v := range items {
 		activityId := v.ActivityId
@@ -146,12 +146,12 @@ func SendWxMsgWithCygxActivitySignUpBySell(items []*cygx.CygxSignupUser) (err er
 		if mobileLen == 0 {
 			return
 		}
-		condition = ""
-		pars = make([]interface{}, 0)
-		condition += ` AND u.mobile IN (` + utils.GetOrmInReplace(mobileLen) + `)`
-		pars = append(pars, mobileArr)
+		//condition = ""
+		//pars = make([]interface{}, 0)
+		//condition += ` AND u.mobile IN (` + utils.GetOrmInReplace(mobileLen) + `)`
+		//pars = append(pars, mobileArr)
 
-		openIdList, e := cygx.GetWxOpenIdBList(condition, pars)
+		openIdList, e := cygx.GetUserRecordListByMobileArr(mobileArr)
 		if e != nil {
 			err = errors.New("GetWxOpenIdBList, Err: " + e.Error())
 			return