Merge branch 'xjjdev' into dev
This commit is contained in:
commit
9065d631ce
@ -205,7 +205,7 @@ func (a *ArtistInfoUserProvider) BindInviteInvitedAccount(ctx context.Context, i
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
} else if data.InviteCode == in.InviteCode {
|
} else if data.InviteCode == in.InviteCode {
|
||||||
//如果数据存更新刷新时间
|
//如果数据存在则刷新更新时间
|
||||||
if err = db.DB.Debug().Save(&data).Error; err != nil {
|
if err = db.DB.Debug().Save(&data).Error; err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@ func (p ViewPassedArtworkStatic) TableName() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func CreateViewPassedArtworkStatic(db *gorm.DB) error {
|
func CreateViewPassedArtworkStatic(db *gorm.DB) error {
|
||||||
// 已通过画作统计
|
// 统计画家通过基本画作审批的画作数量
|
||||||
var sql = `
|
var sql = `
|
||||||
CREATE OR REPLACE VIEW view_passed_artwork_static AS
|
CREATE OR REPLACE VIEW view_passed_artwork_static AS
|
||||||
-- 查询审核通过的画作数量以及相关数据
|
-- 查询审核通过的画作数量以及相关数据
|
||||||
@ -44,7 +44,7 @@ su.mgmt_artist_uid artist_uid
|
|||||||
,MAX(alr.updated_at) latest_updated_at
|
,MAX(alr.updated_at) latest_updated_at
|
||||||
,MAX(rn.name) real_name
|
,MAX(rn.name) real_name
|
||||||
FROM sys_user su
|
FROM sys_user su
|
||||||
LEFT JOIN artwork_lock_record alr ON alr.artist_uid = su.mgmt_artist_uid AND alr.audit_flow_index=3 AND alr.supplement_audit_status=4 AND alr.deleted_at = 0
|
LEFT JOIN artwork_lock_record alr ON alr.artist_uid = su.mgmt_artist_uid AND alr.base_audit_status=4 AND alr.deleted_at = 0
|
||||||
LEFT JOIN real_name rn ON rn.id = su.real_name_id
|
LEFT JOIN real_name rn ON rn.id = su.real_name_id
|
||||||
GROUP BY su.mgmt_artist_uid HAVING su.mgmt_artist_uid !=''
|
GROUP BY su.mgmt_artist_uid HAVING su.mgmt_artist_uid !=''
|
||||||
`
|
`
|
||||||
|
Loading…
Reference in New Issue
Block a user