|
@@ -538,16 +538,19 @@ WHERE
|
|
|
func GetActivityIdToSendFile(endDate string) (items []*ActivityIdRep, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
sql := `SELECT
|
|
|
- *
|
|
|
-FROM
|
|
|
- cygx_activity AS a
|
|
|
- INNER JOIN cygx_activity_signup AS s ON s.activity_id = a.activity_id
|
|
|
-WHERE
|
|
|
- 1 = 1
|
|
|
- AND s.signup_type = 1
|
|
|
- AND s.fail_type = 0
|
|
|
- AND a.is_send_file_toemail = 0
|
|
|
- AND a.activity_time <= ? AND a.activity_time >= NOW() GROUP BY a.activity_id `
|
|
|
+ *
|
|
|
+ FROM
|
|
|
+ cygx_activity AS a
|
|
|
+ INNER JOIN cygx_activity_signup AS s ON s.activity_id = a.activity_id
|
|
|
+ INNER JOIN cygx_activity_type AS t ON a.activity_type_id = t.activity_type_id
|
|
|
+ WHERE
|
|
|
+ 1 = 1
|
|
|
+ AND s.signup_type = 1
|
|
|
+ AND a.yidong_activity_id = ''
|
|
|
+ AND t.activity_type = 1
|
|
|
+ AND s.fail_type = 0
|
|
|
+ AND a.is_send_file_toemail = 0
|
|
|
+ AND a.activity_time <= ? AND a.activity_time >= NOW() GROUP BY a.activity_id `
|
|
|
_, err = o.Raw(sql, endDate).QueryRows(&items)
|
|
|
return
|
|
|
}
|