|
|
|
@ -624,7 +624,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DB.Model(&Approval{}).Where(&Approval{Type: in.Type}).Where(queryApproval).Order("id " + in.OrderBy).Select("id").Find(&ids)
|
|
|
|
|
s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id")
|
|
|
|
|
s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy)
|
|
|
|
|
|
|
|
|
|
if in.StartTime != "" && in.EndTime != "" {
|
|
|
|
|
modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime)
|
|
|
|
@ -636,11 +636,11 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|
|
|
|
if in.SubmitterName == "" && in.ApprovalStatus == 0 {
|
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
|
|
|
|
|
DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
|
|
|
|
|
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成,抄送给我的
|
|
|
|
|
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1).Select("approval_id"))) // 已完成,抄送给我的
|
|
|
|
|
} else {
|
|
|
|
|
sonQuery := DB.Where(queryApproval)
|
|
|
|
|
if in.ApprovalStatus > StatusFail {
|
|
|
|
|
sonQuery.Where(DB.Where("id in (?)", s1))
|
|
|
|
|
sonQuery.Or(DB.Where("id in (?)", s1.Where("approval_id in (?)").Select("approval_id")))
|
|
|
|
|
}
|
|
|
|
|
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
|
|
|
|
|
sonQuery)
|
|
|
|
|