luyanming/fonchain-approval-fork
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
jhc 2023-06-13 17:04:14 +08:00
parent adeae10479
commit f0ab4a944a
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/model/approval.go
View File

@ -626,20 +626,18 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime) modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime)
} }
//if in.Status == 0 { if 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}). // 我需要审批的
// Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的 Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的
//} else { } else {
// sonQuery := DB.Where(&Approval{NowUserId: in.UserID, SubmitterName: queryApproval.SubmitterName}) sonQuery := DB.Where(queryApproval)
// if in.ApprovalStatus > StatusFail { if in.ApprovalStatus > StatusFail {
// sonQuery.Where(&Approval{Status: StatusOk}) sonQuery.Or(DB.Where("id in (?)", s1))
// sonQuery.Or(DB.Where("id in (?)", s1)) }
// } modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( sonQuery)
DB.Where(queryApproval). // 我需要审批的 }
Or(DB.Where("id in (?)", s1)))
//}
modelObj.Count(&count) modelObj.Count(&count)
@ -687,8 +685,8 @@ func MyApprovalWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
if in.UserID != 0 { if in.UserID != 0 {
modelObj = modelObj.Where( modelObj = modelObj.Where(
DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID). DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID).
Where("status != ?", StatusDoing). //完成，我参与审批 Where("status != ?", StatusDoing). //完成，我参与审批
Or(DB.Where("now_user_id", in.UserID).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))) //抄送人(完成抄送) Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送)
} }
@ -754,8 +752,8 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
if in.UserID != 0 { if in.UserID != 0 {
modelObj = modelObj.Where( modelObj = modelObj.Where(
DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID). DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID).
Where("status != ?", StatusDoing). //完成，我参与审批 Where("status != ?", StatusDoing). //完成，我参与审批
Or(DB.Where("now_user_id", in.UserID).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))) //抄送人(完成抄送) Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送)
} }