|
|
@ -686,13 +686,39 @@ func MySubmitApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
Preload("Exhibition.ApprovalExhibitions")
|
|
|
|
Preload("Exhibition.ApprovalExhibitions")
|
|
|
|
|
|
|
|
|
|
|
|
if in.Status != 0 {
|
|
|
|
if in.Status != 0 {
|
|
|
|
if in.Status == 6 {
|
|
|
|
modelObj = modelObj.Where(&Approval{Status: int8(in.Status)})
|
|
|
|
modelObj.Where("status in ?", []int{4, 5})
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
|
|
|
modelObj = modelObj.Where(&Approval{Status: int8(in.Status)})
|
|
|
|
if in.Type != "" {
|
|
|
|
}
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
modelObj.Count(&count)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
modelObj.Limit(int(in.PageSize)).Offset(page.GetOffset(in.Page, in.PageSize)).Order("id desc").Find(&list)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return list, count
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
|
|
|
var list []*Approval
|
|
|
|
|
|
|
|
var count int64
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//list
|
|
|
|
|
|
|
|
modelObj := DB.Model(&Approval{}).
|
|
|
|
|
|
|
|
Preload("Show").
|
|
|
|
|
|
|
|
Preload("Work.ApprovalWorks").
|
|
|
|
|
|
|
|
Preload("Bundle").
|
|
|
|
|
|
|
|
Preload("BundlePayPrice").
|
|
|
|
|
|
|
|
Preload("ApprovalWorkFlows").
|
|
|
|
|
|
|
|
Preload("ExhibitionReward.ApprovalExhibitions").
|
|
|
|
|
|
|
|
Preload("ApprovalType.ApprovalTypeGroup").
|
|
|
|
|
|
|
|
Preload("Exhibition.ApprovalExhibitions")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
modelObj.Where(" json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)
|
|
|
|
|
|
|
|
|
|
|
|
if in.Type != "" {
|
|
|
|
if in.Type != "" {
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type})
|
|
|
|
}
|
|
|
|
}
|
|
|
|