时间搜索
This commit is contained in:
parent
efcd9fcdce
commit
49c8d6a454
@ -610,6 +610,10 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
|
|||||||
}
|
}
|
||||||
s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id")
|
s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id")
|
||||||
|
|
||||||
|
if in.StartTime != "" && in.EndTime != "" {
|
||||||
|
modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime)
|
||||||
|
}
|
||||||
|
|
||||||
if queryApproval.SubmitterName == "" && in.Status == 0 {
|
if queryApproval.SubmitterName == "" && in.Status == 0 {
|
||||||
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
|
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
|
||||||
DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
|
DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
|
||||||
|
Loading…
Reference in New Issue
Block a user