|
@@ -49,7 +49,7 @@ type ApplyList struct {
|
|
|
IsMove int `description:"是否已移动"`
|
|
|
Source int `description:"申请来源 1-我的 2-活动 3-图库"`
|
|
|
SourceAgent int `description:"申请入口来源,1:小程序,2:pc"`
|
|
|
- FromPage string `description:"申请来源具体页面`
|
|
|
+ FromPage string `description:"申请来源具体页面"`
|
|
|
CreateTime time.Time `description:"申请时间"`
|
|
|
}
|
|
|
|
|
@@ -175,6 +175,7 @@ WHERE
|
|
|
AND ( a.mobile <> '' OR a.email <> '' )
|
|
|
AND ( c.create_platform <> 4 OR c.create_platform IS NULL )
|
|
|
AND ((y.apply_record_id > 0 and y.create_time > ?) OR (y.apply_record_id is null AND a.created_time > ?) )
|
|
|
+ AND ( y.source > 0 )
|
|
|
`
|
|
|
sql += condition
|
|
|
sql += ` GROUP BY a.user_id ORDER BY last_time desc`
|
|
@@ -205,6 +206,7 @@ WHERE
|
|
|
AND ( a.mobile <> '' OR a.email <> '' )
|
|
|
AND ( c.create_platform <> 4 OR c.create_platform IS NULL )
|
|
|
AND ((y.apply_record_id > 0 and y.create_time > ?) OR (y.apply_record_id is null AND a.created_time > ?) )
|
|
|
+ AND ( y.source > 0 )
|
|
|
`
|
|
|
pars = append(pars, startTime)
|
|
|
pars = append(pars, startTime)
|
|
@@ -259,6 +261,7 @@ WHERE
|
|
|
AND ( a.mobile <> '' OR a.email <> '' )
|
|
|
AND ( c.create_platform <> 4 OR c.create_platform IS NULL )
|
|
|
AND ((y.apply_record_id > 0 and y.create_time > ?) OR (y.apply_record_id is null AND a.created_time > ?) )
|
|
|
+ AND ( y.source > 0 )
|
|
|
`
|
|
|
sql += condition
|
|
|
sql += ` GROUP BY a.user_id ORDER BY last_time desc`
|