Browse Source

no message

xingzai 3 years ago
parent
commit
2c271e484b
1 changed files with 3 additions and 3 deletions
  1. 3 3
      models/activity.go

+ 3 - 3
models/activity.go

@@ -112,7 +112,7 @@ func GetAddActivityInfoByIdShow(uid, ActivityId int) (item *ActivityDetail, err
 	o := orm.NewOrm()
 	sql := `SELECT *,( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = a.activity_id AND s.user_id = ?   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS is_signup,
 			( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = a.activity_id  AND s.is_cancel = 0 AND s.do_fail_type = 0) AS signup_num,
-			( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = a.activity_id AND m.user_id = ?  AND m.is_cancel = 0 AND s.do_fail_type = 0) AS is_cancel_meeting_reminder
+			( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = a.activity_id AND m.user_id = ?  AND m.is_cancel = 0 ) AS is_cancel_meeting_reminder
 			FROM cygx_activity AS a  WHERE activity_id=? AND publish_status = 1 `
 	err = o.Raw(sql, uid, uid, ActivityId).QueryRow(&item)
 	return
@@ -154,7 +154,7 @@ func GetActivityListAll(condition string, pars []interface{}, uid, startSize, pa
 	sql := `SELECT * ,
 		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ?   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS is_signup,
 		( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS signup_num,
-		( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.user_id = ?  AND m.is_cancel = 0  AND m.do_fail_type = 0 ) AS is_cancel_meeting_reminder
+		( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.user_id = ?  AND m.is_cancel = 0  ) AS is_cancel_meeting_reminder
 		FROM cygx_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -193,7 +193,7 @@ func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageS
 	o := orm.NewOrm()
 	sql := `SELECT art.*,( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ? AND s.is_cancel = 0 AND s.do_fail_type = 0) AS is_signup,
                      ( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND  s.is_cancel = 0  AND s.fail_type = 0 AND s.do_fail_type = 0) AS signup_num ,
-					 ( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.is_cancel = 0 AND m.user_id = ? AND s.do_fail_type = 0) AS is_cancel_meeting_reminder
+					 ( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.is_cancel = 0 AND m.user_id = ? ) AS is_cancel_meeting_reminder
             FROM cygx_activity AS art
 			INNER JOIN cygx_my_schedule as my ON my.activity_id = art.activity_id 
             WHERE 1=1 AND my.user_id = ? `