From 00830ff6e86a33d3e46d8e0d68f2bee70c6f5540 Mon Sep 17 00:00:00 2001 From: jhc <9316338+wangyitao309@user.noreply.gitee.com> Date: Tue, 13 Jun 2023 13:18:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AE=A1=E6=89=B9=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/model/approval.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkg/model/approval.go b/pkg/model/approval.go index cc0bffc..8e6119b 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -610,9 +610,12 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { } s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id") + /*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))) // 已完成，抄送给我的 */ 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))) // 已完成，抄送给我的 + DB.Where(queryApproval). // 我需要审批的 + Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的 modelObj.Count(&count) if len(ids) > 0 { //根据具体id排序 @@ -659,8 +662,8 @@ func MyApprovalWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { if in.UserID != 0 { modelObj = modelObj.Where( DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID). - Where("status != ?", StatusDoing). //完成，我参与审批 - Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, + Where("status != ?", StatusDoing). //完成，我参与审批 + Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送) } @@ -712,6 +715,10 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { modelObj = modelObj.Where(&Approval{SubmitterName: in.SubmitterName}) } + if in.StartTime != "" && in.EndTime != "" { + modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime) + } + /** * 审批展示(抄送在此不表) / \ @@ -722,8 +729,8 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { if in.UserID != 0 { modelObj = modelObj.Where( DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID). - Where("status != ?", StatusDoing). //完成，我参与审批 - Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, + Where("status != ?", StatusDoing). //完成，我参与审批 + Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送) }