|
|
@@ -44,7 +44,8 @@ func GroupingActivityToJmcj(cont context.Context) (err error) {
|
|
|
}
|
|
|
textLen := 15
|
|
|
pars = make([]interface{}, 0)
|
|
|
- condition = " AND activity_time BETWEEN ? AND ? AND publish_status = 1 AND jmcj_activity_id = '' "
|
|
|
+ //进门财经的不匹配的易董办会的
|
|
|
+ condition = " AND activity_time BETWEEN ? AND ? AND publish_status = 1 AND jmcj_activity_id = '' AND yidong_activity_id_by_cygx = '' AND yidong_activity_id = '' "
|
|
|
//condition += " AND activity_id = 1339 "
|
|
|
pars = append(pars, startDate, endDate)
|
|
|
listHz, e := models.GetActivityListByCondition(condition, pars)
|
|
|
@@ -195,7 +196,7 @@ func GetActivityMeetingByJmcj(cont context.Context) (err error) {
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
//获取弘则要同步到会信息的活动
|
|
|
- condition = ` AND activity_time BETWEEN ? AND ? AND publish_status = 1 AND jmcj_activity_id != '' OR ( activity_id IN (` + detail.ConfigValue + `) AND publish_status = 1 AND jmcj_activity_id != '' ) `
|
|
|
+ condition = ` AND activity_time BETWEEN ? AND ? AND publish_status = 1 AND jmcj_activity_id != '' AND yidong_activity_id_by_cygx = '' AND yidong_activity_id = '' OR ( activity_id IN (` + detail.ConfigValue + `) AND publish_status = 1 AND jmcj_activity_id != '' ) `
|
|
|
pars = append(pars, startDate, endDate)
|
|
|
listHz, e := models.GetActivityListByCondition(condition, pars)
|
|
|
if e != nil && e.Error() != utils.ErrNoRow() {
|
xingzai